Align namespaces in Umbraco.Tests.Common

2021-02-10 14:45:44 +01:00
parent 72117c1d52
commit 476d60cc50
309 changed files with 470 additions and 497 deletions
--- a/src/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs
@@ -3,10 +3,9 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class AuditEntryBuilder : AuditEntryBuilder<object>
    {
--- a/src/Umbraco.Tests.Common/Builders/BuilderBase.cs
+++ b/src/Umbraco.Tests.Common/Builders/BuilderBase.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public abstract class BuilderBase<T>
    {
--- a/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
+++ b/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public abstract class ChildBuilderBase<TParent, TType> : BuilderBase<TType>
    {
--- a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
@@ -3,9 +3,8 @@

 using System.Collections.Generic;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Core.PropertyEditors;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ConfigurationEditorBuilder<TParent> : ChildBuilderBase<TParent, IConfigurationEditor>
    {
--- a/src/Umbraco.Tests.Common/Builders/ContentBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentBuilder.cs
@@ -6,14 +6,12 @@ using System.Collections.Generic;
 using System.Globalization;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
-using Umbraco.Tests.Testing;
+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.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentBuilder
        : BuilderBase<Content>,
--- a/src/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs
@@ -4,9 +4,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentItemSaveBuilder : BuilderBase<ContentItemSave>,
        IWithIdBuilder,
--- a/src/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs
@@ -2,9 +2,9 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentPropertyBasicBuilder<TParent> : ChildBuilderBase<TParent, ContentPropertyBasic>,
        IWithIdBuilder, IWithAliasBuilder
--- a/src/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs
@@ -5,11 +5,10 @@ using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public abstract class ContentTypeBaseBuilder<TParent, TType>
        : ChildBuilderBase<TParent, TType>,
--- a/src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
@@ -4,13 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentTypeBuilder
        : ContentTypeBaseBuilder<ContentBuilder, IContentType>,
--- a/src/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs
@@ -3,11 +3,10 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentTypeSortBuilder
        : ChildBuilderBase<ContentTypeBuilder, ContentTypeSort>,
--- a/src/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class ContentVariantSaveBuilder<TParent> : ChildBuilderBase<TParent, ContentVariantSave>,
        IWithNameBuilder,
--- a/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
@@ -9,11 +9,8 @@ using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
-using Umbraco.Core.Services;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DataEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataEditor>
    {
--- a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -4,11 +4,10 @@
 using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Core.Models;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Core.Serialization;
-using Umbraco.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DataTypeBuilder
        : BuilderBase<DataType>,
--- a/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
@@ -8,11 +8,8 @@ using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
-using Umbraco.Core.Services;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DataValueEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataValueEditor>
    {
--- a/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
@@ -5,10 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DictionaryItemBuilder
        : BuilderBase<DictionaryItem>,
--- a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
@@ -3,10 +3,9 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DictionaryTranslationBuilder
        : ChildBuilderBase<DictionaryItemBuilder, IDictionaryTranslation>,
--- a/src/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class DocumentEntitySlimBuilder
        : BuilderBase<DocumentEntitySlim>,
--- a/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs
@@ -2,9 +2,9 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class EntitySlimBuilder
        : BuilderBase<EntitySlim>,
--- a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -4,10 +4,9 @@
 using System;
 using System.Globalization;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions
 {
    public static class BuilderExtensions
    {
--- a/src/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;

-namespace Umbraco.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions
 {
    public static class ContentItemSaveBuilderExtensions
    {
--- a/src/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs
@@ -2,11 +2,9 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions
 {
    public static class ContentTypeBuilderExtensions
    {
--- a/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions
 {
    public static class StringExtensions
    {
--- a/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class GenericCollectionBuilder<TBuilder, T>
        : ChildBuilderBase<TBuilder, IEnumerable<T>>
--- a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
@@ -3,7 +3,7 @@

 using System.Collections.Generic;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class GenericDictionaryBuilder<TBuilder, TKey, TValue>
        : ChildBuilderBase<TBuilder, IDictionary<TKey, TValue>>
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IAccountBuilder : IWithLoginBuilder,
                                       IWithEmailBuilder,
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IBuildContentTypes
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IBuildPropertyGroups
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IBuildPropertyTypes
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithAliasBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithCreateDateBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-using System;
-
-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithCreatorIdBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
@@ -3,7 +3,7 @@

 using System.Globalization;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithCultureInfoBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithDeleteDateBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithDescriptionBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithEmailBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithFailedPasswordAttemptsBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithIconBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithIdBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithIsApprovedBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithIsContainerBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithIsLockedOutBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithKeyBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithLastLoginDateBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithLastPasswordChangeDateBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithLevelBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithLoginBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithNameBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithParentContentTypeBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithParentIdBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithPathBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithPropertyTypeIdsIncrementingFrom
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithPropertyValues
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithSortOrderBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-using System;
-
-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithSupportsPublishing
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithThumbnailBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithTrashedBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
@@ -3,7 +3,7 @@

 using System;

-namespace Umbraco.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
 {
    public interface IWithUpdateDateBuilder
    {
--- a/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
@@ -5,10 +5,9 @@ using System;
 using System.Globalization;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class LanguageBuilder : LanguageBuilder<object>
    {
--- a/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MacroBuilder.cs
@@ -6,11 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MacroBuilder
        : BuilderBase<Macro>,
--- a/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs
@@ -3,11 +3,10 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MacroPropertyBuilder
        : ChildBuilderBase<MacroBuilder, IMacroProperty>,
--- a/src/Umbraco.Tests.Common/Builders/MediaBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MediaBuilder.cs
@@ -4,14 +4,12 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
-using Umbraco.Tests.Testing;
+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.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MediaBuilder
        : BuilderBase<Media>,
--- a/src/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs
@@ -4,13 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MediaTypeBuilder
        : ContentTypeBaseBuilder<MediaBuilder, IMediaType>,
--- a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
@@ -4,11 +4,10 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MemberBuilder
        : BuilderBase<Member>,
--- a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
@@ -4,10 +4,9 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MemberGroupBuilder
        : BuilderBase<MemberGroup>,
--- a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
@@ -4,13 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class MemberTypeBuilder
        : ContentTypeBaseBuilder<MemberBuilder, IMemberType>,
--- a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
@@ -3,10 +3,9 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class PropertyBuilder
        : BuilderBase<IProperty>,
--- a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
@@ -5,10 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class PropertyGroupBuilder : PropertyGroupBuilder<NullPropertyGroupBuilderParent>
    {
--- a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
@@ -4,13 +4,11 @@
 using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class PropertyTypeBuilder : PropertyTypeBuilder<NullPropertyTypeBuilderParent>
    {
--- a/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs
@@ -3,10 +3,9 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class RelationBuilder
        : BuilderBase<Relation>,
--- a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
@@ -3,10 +3,9 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class RelationTypeBuilder
        : ChildBuilderBase<RelationBuilder, IRelationType>,
--- a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class StylesheetBuilder
        : BuilderBase<Stylesheet>
--- a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
@@ -4,11 +4,10 @@
 using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class TemplateBuilder
        : ChildBuilderBase<ContentTypeBuilder, ITemplate>,
--- a/src/Umbraco.Tests.Common/Builders/TreeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/TreeBuilder.cs
@@ -2,11 +2,10 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Trees;
-using Umbraco.Core;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class TreeBuilder
        : BuilderBase<Tree>,
--- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Extensions;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class UserBuilder : UserBuilder<object>
    {
--- a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
@@ -6,10 +6,10 @@ using System.Linq;
 using Moq;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Tests.Common.Builders.Extensions;
-using Umbraco.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class UserGroupBuilder : UserGroupBuilder<object>
    {
--- a/src/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs
@@ -3,7 +3,7 @@

 using System.Xml;

-namespace Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders
 {
    public class XmlDocumentBuilder : BuilderBase<XmlDocument>
    {
--- a/src/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs
+++ b/src/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs
@@ -4,9 +4,8 @@
 using System;
 using System.Reflection;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;

-namespace Umbraco.Tests.Testing
+namespace Umbraco.Cms.Tests.Common.Extensions
 {
    public static class ContentBaseExtensions
    {
--- a/src/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs
+++ b/src/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs
@@ -3,11 +3,10 @@

 using System.Collections.Generic;
 using Moq;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;

-namespace Umbraco.Tests.Published
+namespace Umbraco.Cms.Tests.Common.Published
 {
    public class PublishedSnapshotTestObjects
    {
--- a/src/Umbraco.Tests.Common/TestClone.cs
+++ b/src/Umbraco.Tests.Common/TestClone.cs
@@ -3,9 +3,8 @@

 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Core.Models;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    public class TestClone : IDeepCloneable, IEquatable<TestClone>
    {
--- a/src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Web.PublishedCache;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    public class TestDefaultCultureAccessor : IDefaultCultureAccessor
    {
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -23,13 +23,13 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Extensions;
-using Umbraco.Tests.Common.TestHelpers;
 using Constants = Umbraco.Cms.Core.Constants;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    /// <summary>
    /// Common helper properties and methods useful to testing
--- a/src/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Extensions.Logging;
 using Moq;

-namespace Umbraco.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    public static class LogTestHelper
    {
--- a/src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
@@ -5,11 +5,9 @@ using Moq;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
-using Umbraco.Core.Services;

-namespace Umbraco.Tests.TestHelpers.Entities
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    public class MockedValueEditors
    {
--- a/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs
@@ -18,7 +18,7 @@ using Umbraco.Cms.Core.Xml;
 using Umbraco.Core.Serialization;
 using Umbraco.Extensions;

-namespace Umbraco.Tests.Common.PublishedContent
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    public class SolidPublishedSnapshot : IPublishedSnapshot
    {
--- a/src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    public static class StringNewLineExtensions
    {
--- a/src/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs
@@ -5,9 +5,8 @@ using System;
 using StackExchange.Profiling;
 using StackExchange.Profiling.SqlFormatters;
 using Umbraco.Cms.Core.Logging;
-using Umbraco.Core.Logging;

-namespace Umbraco.Tests.TestHelpers.Stubs
+namespace Umbraco.Cms.Tests.Common.TestHelpers.Stubs
 {
    public class TestProfiler : IProfiler
    {
--- a/src/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs
@@ -16,7 +16,7 @@ using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;

-namespace Umbraco.Tests.Testing
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    /// <summary>
    /// An implementation of <see cref="IUmbracoDatabase"/> for tests.
--- a/src/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs
+++ b/src/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs
@@ -3,7 +3,7 @@

 using System.Runtime.InteropServices;

-namespace Umbraco.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers
 {
    public static class TestEnvironment
    {
--- a/src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Web.PublishedCache;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    public class TestPublishedSnapshotAccessor : IPublishedSnapshotAccessor
    {
--- a/src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
@@ -2,9 +2,8 @@
 // See LICENSE for more details.

 using Umbraco.Cms.Core.Web;
-using Umbraco.Web;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    public class TestUmbracoContextAccessor : IUmbracoContextAccessor
    {
--- a/src/Umbraco.Tests.Common/TestVariationContextAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestVariationContextAccessor.cs
@@ -3,7 +3,7 @@

 using Umbraco.Cms.Core.Models.PublishedContent;

-namespace Umbraco.Tests.Common
+namespace Umbraco.Cms.Tests.Common
 {
    /// <summary>
    /// Provides an implementation of <see cref="IVariationContextAccessor"/> for tests.
--- a/src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
+++ b/src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
@@ -8,7 +8,7 @@ using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Exceptions;

-namespace Umbraco.Tests.Testing
+namespace Umbraco.Cms.Tests.Common.Testing
 {
    public abstract class TestOptionAttributeBase : Attribute
    {
--- a/src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
+++ b/src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
@@ -3,9 +3,8 @@

 using System;
 using Umbraco.Cms.Core;
-using Umbraco.Core;

-namespace Umbraco.Tests.Testing
+namespace Umbraco.Cms.Tests.Common.Testing
 {
    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, /*AllowMultiple = false,*/ Inherited = false)]
    public class UmbracoTestAttribute : TestOptionAttributeBase
--- a/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
+++ b/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.

-namespace Umbraco.Tests.Testing
+namespace Umbraco.Cms.Tests.Common.Testing
 {
    public static class UmbracoTestOptions
    {
--- a/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
+++ b/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
@@ -3,6 +3,7 @@
  <PropertyGroup>
      <TargetFramework>netstandard2.0</TargetFramework>
      <LangVersion>latest</LangVersion>
+      <RootNamespace>Umbraco.Cms.Tests.Common</RootNamespace>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs
@@ -8,8 +8,8 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.Testing;
 using Umbraco.Web.Cache;

 namespace Umbraco.Tests.Cache
--- a/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/ComponentRuntimeTests.cs
@@ -12,13 +12,13 @@ using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Extensions;
 using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.Testing;

 namespace Umbraco.Tests.Integration
 {
--- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -19,12 +19,12 @@ using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.WebAssets;
 using Umbraco.Cms.Examine;
 using Umbraco.Cms.Infrastructure.PublishedCache;
+using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Examine;
 using Umbraco.Extensions;
 using Umbraco.Infrastructure.HostedServices;
 using Umbraco.Tests.Integration.Implementations;
-using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Web.Search;

 namespace Umbraco.Tests.Integration.DependencyInjection
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -29,10 +29,10 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Net;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Runtime;
+using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Web.Common.AspNetCore;
 using Umbraco.Core.Persistence;
 using Umbraco.Extensions;
-using Umbraco.Tests.Common;
 using File = System.IO.File;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;

--- a/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
+++ b/src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -19,13 +19,13 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Extensions;
 using Umbraco.Tests.Integration.DependencyInjection;
 using Umbraco.Tests.Integration.Testing;
-using Umbraco.Tests.Testing;
 using Constants = Umbraco.Cms.Core.Constants;

 namespace Umbraco.Tests.Integration.TestServerTest
--- a/Show More
+++ b/Show More