diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index ee90d788591..ccd2e40fce0 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -41,8 +41,8 @@ Provide any additional context that may be helpful in understanding and/or resol
 Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
 -->
 * [ ] 10.00.00 alpha build
-* [ ] 09.07.00 release candidate
-* [ ] 09.06.02 latest supported release
+* [ ] 09.07.01 release candidate
+* [ ] 09.07.00 latest supported release
 
 ## Affected browser
 <!-- 
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..68add256cbc
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,5 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
\ No newline at end of file
diff --git a/DNN Platform/DotNetNuke.Abstractions/Application/IHostSettingsService.cs b/DNN Platform/DotNetNuke.Abstractions/Application/IHostSettingsService.cs
new file mode 100644
index 00000000000..4c913107719
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/Application/IHostSettingsService.cs	
@@ -0,0 +1,168 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Application
+{
+    using System.Collections.Generic;
+
+    using DotNetNuke.Abstractions.Settings;
+
+    /// <summary>
+    /// The <see cref="IHostSettingsService"/> provides business layer of the HostSettings
+    /// Entity.
+    /// </summary>
+    /// <example>
+    /// 
+    /// <code lang="C#">
+    /// public class MySampleClass
+    /// {
+    ///     IHostSettingsService service;
+    ///     public MySampleClass(IHostSettingsService service)
+    ///     {
+    ///         this.service = service;
+    ///     }
+    ///
+    ///     public bool CheckUpgrade { get => this.service.GetBoolean("CheckUpgrade", true);
+    /// }
+    /// </code>
+    /// </example>
+    public interface IHostSettingsService
+    {
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        bool GetBoolean(string key);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        bool GetBoolean(string key, bool defaultValue);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        double GetDouble(string key);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        double GetDouble(string key, double defaultValue);
+
+        /// <summary>
+        /// takes in a text value, decrypts it with a FIPS compliant algorithm and returns the value.
+        /// </summary>
+        /// <param name="key">the host setting to read.</param>
+        /// <param name="passPhrase">the pass phrase used for encryption/decryption.</param>
+        /// <returns>The setting value as a <see cref="string"/>.</returns>
+        string GetEncryptedString(string key, string passPhrase);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        int GetInteger(string key);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        int GetInteger(string key, int defaultValue);
+
+        /// <summary>
+        /// Gets all host settings.
+        /// </summary>
+        /// <returns>host setting.</returns>
+        Dictionary<string, IConfigurationSetting> GetSettings();
+
+        /// <summary>
+        /// Gets all host settings as dictionary.
+        /// </summary>
+        /// <returns>host setting's value.</returns>
+        Dictionary<string, string> GetSettingsDictionary();
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        string GetString(string key);
+
+        /// <summary>
+        /// Gets the setting value by the specific key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
+        /// <returns>host setting's value.</returns>
+        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        string GetString(string key, string defaultValue);
+
+        /// <summary>
+        /// Increments the Client Resource Manager (CRM) version to bust local cache.
+        /// </summary>
+        /// <param name="includeOverridingPortals">If true also forces a CRM version increment on portals that have non-default settings for CRM.</param>
+        void IncrementCrmVersion(bool includeOverridingPortals);
+
+        /// <summary>
+        /// Updates the specified config.
+        /// </summary>
+        /// <param name="config">The config.</param>
+        void Update(IConfigurationSetting config);
+
+        /// <summary>
+        /// Updates the specified config.
+        /// </summary>
+        /// <param name="config">The config.</param>
+        /// <param name="clearCache">if set to <c>true</c> will clear cache after updating the setting.</param>
+        void Update(IConfigurationSetting config, bool clearCache);
+
+        /// <summary>
+        /// Updates the specified settings.
+        /// </summary>
+        /// <param name="settings">The settings.</param>
+        void Update(Dictionary<string, string> settings);
+
+        /// <summary>
+        /// Updates the setting for a specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        void Update(string key, string value);
+
+        /// <summary>
+        /// Updates the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="clearCache">if set to <c>true</c> will clear cache after update settings.</param>
+        void Update(string key, string value, bool clearCache);
+
+        /// <summary>
+        /// Takes in a <see cref="string"/> value, encrypts it with a FIPS compliant algorithm and stores it.
+        /// </summary>
+        /// <param name="key">host settings key.</param>
+        /// <param name="value">host settings value.</param>
+        /// <param name="passPhrase">pass phrase to allow encryption/decryption.</param>
+        void UpdateEncryptedString(string key, string value, string passPhrase);
+    }
+}
diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasInfo.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasInfo.cs
index 0ad7259c3a5..37946458c43 100644
--- a/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasInfo.cs	
+++ b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasInfo.cs	
@@ -1,27 +1,54 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
+
 namespace DotNetNuke.Abstractions.Portals
 {
-    using System.Data;
-    using System.Xml;
-    using System.Xml.Schema;
+    using DotNetNuke.Abstractions.Urls;
 
+    /// <summary>
+    /// Portal Alias Info interface.
+    /// </summary>
     public interface IPortalAliasInfo
     {
-        //BrowserTypes BrowserType { get; set; }
-        string CultureCode { get; set; }
-        string HTTPAlias { get; set; }
+        /// <summary>
+        /// Gets or sets the http alias.
+        /// </summary>
+        string HttpAlias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Portal Alias ID.
+        /// </summary>
+        int PortalAliasId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Portal ID.
+        /// </summary>
+        int PortalId { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this alias is the primary alias for the site/portal.
+        /// </summary>
         bool IsPrimary { get; set; }
-        int KeyID { get; set; }
-        int PortalAliasID { get; set; }
-        int PortalID { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the alias is a redirect alias.
+        /// </summary>
         bool Redirect { get; set; }
-        string Skin { get; set; }
 
-        void Fill(IDataReader dr);
-        XmlSchema GetSchema();
-        void ReadXml(XmlReader reader);
-        void WriteXml(XmlWriter writer);
+        /// <summary>
+        /// Gets or sets the Browser Type.
+        /// </summary>
+        BrowserTypes BrowserType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the culture code for this alias, if there is one.
+        /// </summary>
+        string CultureCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the skin/theme for this alias, if there is one.
+        /// </summary>
+        string Skin { get; set; }
     }
 }
diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasService.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasService.cs
new file mode 100644
index 00000000000..cb04d1d982f
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalAliasService.cs	
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Portals
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Portal Alias APIs for managing the different Portal Alias.
+    /// </summary>
+    public interface IPortalAliasService
+    {
+        /// <summary>
+        /// Gets the portal alias by portal.
+        /// </summary>
+        /// <param name="portalId">The portal id.</param>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <returns>Portal alias.</returns>
+        string GetPortalAliasByPortal(int portalId, string portalAlias);
+
+        /// <summary>
+        /// Gets the portal alias by tab.
+        /// </summary>
+        /// <param name="tabId">The tab ID.</param>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <returns>Portal alias.</returns>
+        string GetPortalAliasByTab(int tabId, string portalAlias);
+
+        /// <summary>
+        /// Validates the alias.
+        /// </summary>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <param name="ischild">if set to <c>true</c>, validate the alias as a child alias (i.e. as a subdirectory of another alias).</param>
+        /// <returns><c>true</c> if the alias is a valid url format; otherwise return <c>false</c>.</returns>
+        bool ValidateAlias(string portalAlias, bool ischild);
+
+        /// <summary>
+        /// Adds a new Portal Alias.
+        /// </summary>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <returns>The new portal alias ID.</returns>
+        int AddPortalAlias(IPortalAliasInfo portalAlias);
+
+        /// <summary>
+        /// Deletes an existing portal alias.
+        /// </summary>
+        /// <param name="portalAlias">The portal alias to delete.</param>
+        void DeletePortalAlias(IPortalAliasInfo portalAlias);
+
+        /// <summary>
+        /// Get a portal alias by name.
+        /// </summary>
+        /// <param name="alias">The name of the portal alias.</param>
+        /// <returns>The portal alias.</returns>
+        IPortalAliasInfo GetPortalAlias(string alias);
+
+        /// <summary>
+        /// Gets the portal alias.
+        /// </summary>
+        /// <param name="alias">The portal alias.</param>
+        /// <param name="portalId">The portal ID.</param>
+        /// <returns>Portal Alias Info.</returns>
+        IPortalAliasInfo GetPortalAlias(string alias, int portalId);
+
+        /// <summary>
+        /// Gets the portal alias by portal alias ID.
+        /// </summary>
+        /// <param name="portalAliasId">The portal alias ID.</param>
+        /// <returns>Portal alias info.</returns>
+        IPortalAliasInfo GetPortalAliasByPortalAliasId(int portalAliasId);
+
+        /// <summary>
+        /// Get all portal aliases.
+        /// </summary>
+        /// <returns>A collection of portal aliases.</returns>
+        IDictionary<string, IPortalAliasInfo> GetPortalAliases();
+
+        /// <summary>
+        /// Get all the portal aliases for a specific portal.
+        /// </summary>
+        /// <param name="portalId">The portal ID.</param>
+        /// <returns>An IEnumerable of portal aliases.</returns>
+        IEnumerable<IPortalAliasInfo> GetPortalAliasesByPortalId(int portalId);
+
+        /// <summary>
+        /// Gets the portal by portal alias ID.
+        /// </summary>
+        /// <param name="portalAliasId">The portal alias id.</param>
+        /// <returns>Portal info.</returns>
+        IPortalInfo GetPortalByPortalAliasId(int portalAliasId);
+
+        /// <summary>
+        /// Update a specified portal alias.
+        /// </summary>
+        /// <param name="portalAlias">The portal alias to update.</param>
+        void UpdatePortalAlias(IPortalAliasInfo portalAlias);
+    }
+}
diff --git a/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalInfo.cs b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalInfo.cs
new file mode 100644
index 00000000000..588f7d722f5
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/Portals/IPortalInfo.cs	
@@ -0,0 +1,250 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Portals
+{
+    using System;
+
+    /// <summary>
+    /// The portal info.
+    /// </summary>
+    public interface IPortalInfo
+    {
+        /// <summary>
+        /// Gets or sets the footer text as specified in the Portal settings.
+        /// </summary>
+        /// <value>Footer text of the portal.</value>
+        /// <returns>Returns the the footer text of the portal.</returns>
+        /// <remarks>
+        /// <example>This show the usage of the <c>FooterText</c> property
+        /// <code lang="vbnet">
+        /// txtFooterText.Text = objPortal.FooterText
+        /// </code>
+        /// </example>
+        /// </remarks>
+        string FooterText { get; set; }
+
+        /// <summary>
+        /// Gets or sets home directory of the portal (logical path).
+        /// </summary>
+        /// <value>Portal home directory.</value>
+        string HomeDirectory { get; set; }
+
+        /// <summary>
+        /// Gets home System (local) directory of the portal (logical path).
+        /// </summary>
+        /// <value>Portal home system directory.</value>
+        string HomeSystemDirectory { get; }
+
+        /// <summary>
+        /// Gets fysical path on disk of the home directory of the portal.
+        /// </summary>
+        /// <value>Physical path on disk of the home directory of the portal.</value>
+        string HomeDirectoryMapPath { get; }
+
+        /// <summary>
+        /// Gets fysical path on disk of the home directory of the portal.
+        /// </summary>
+        /// <value>Physical path on disk of the home directory of the portal.</value>
+        string HomeSystemDirectoryMapPath { get; }
+
+        /// <summary>
+        /// Gets or sets userID of the user who is the admininistrator of the portal.
+        /// </summary>
+        /// <value>UserId of the user who is the portal admin.</value>
+        int AdministratorId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the RoleId of the Security Role of the Administrators group of the portal.
+        /// </summary>
+        /// <value>RoleId of de Administrators Security Role.</value>
+        int AdministratorRoleId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabId at which admin tasks start.
+        /// </summary>
+        /// <value>TabID of admin tasks.</value>
+        int AdminTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets current host version.
+        /// </summary>
+        string CrmVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Culture Code of the portal.
+        /// </summary>
+        string CultureCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets default language for the portal.
+        /// </summary>
+        /// <value>Default language of the portal.</value>
+        string DefaultLanguage { get; set; }
+
+        /// <summary>
+        /// Gets or sets description of the portal.
+        /// </summary>
+        /// <value>Description of the portal.</value>
+        string Description { get; set; }
+
+        /// <summary>
+        /// Gets or sets the default e-mail to be used in the portal.
+        /// </summary>
+        /// <value>E-mail of the portal.</value>
+        string Email { get; set; }
+
+        /// <summary>
+        /// Gets or sets date at which the portal expires.
+        /// </summary>
+        /// <value>Date of expiration of the portal.</value>
+        DateTime ExpiryDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets GUID of the portal info object.
+        /// </summary>
+        /// <value>Portal info Object GUID.</value>
+        Guid GUID { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabdId of the Home page.
+        /// </summary>
+        /// <value>TabId of the Home page.</value>
+        int HomeTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets total disk space allowed for the portal (Mb). 0 means not limited.
+        /// </summary>
+        /// <value>Diskspace allowed for the portal.</value>
+        int HostSpace { get; set; }
+
+        /// <summary>
+        /// Gets or sets keywords (separated by ,) for this portal.
+        /// </summary>
+        /// <value>Keywords seperated by .</value>
+        string KeyWords { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabId with the login control, page to login.
+        /// </summary>
+        /// <value>TabId of the Login page.</value>
+        int LoginTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the logo associated with the portal. The admin can set the logo in the portal settings.
+        /// </summary>
+        /// <value>URL of the logo.</value>
+        string LogoFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets number of portal pages allowed in the portal. 0 means not limited.
+        /// </summary>
+        /// <value>Number of portal pages allowed.</value>
+        int PageQuota { get; set; }
+
+        /// <summary>
+        /// Gets or sets unique idenitifier of the Portal within the site.
+        /// </summary>
+        /// <value>Portal identifier.</value>
+        int PortalId { get; set; }
+
+        /// <summary>
+        /// Gets or sets contains the id of the portal group that the portal belongs to
+        /// Will be null or -1 (null.nullinteger) if the portal does not belong to a portal group.
+        /// </summary>
+        int PortalGroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets name of the portal. Can be set at creation time, Admin can change the name in the portal settings.
+        /// </summary>
+        /// <value>Name of the portal.</value>
+        string PortalName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the RoleId of the Registered users group of the portal.
+        /// </summary>
+        /// <value>RoleId of the Registered users. </value>
+        int RegisteredRoleId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Registration page.
+        /// </summary>
+        /// <value>TabId of the Registration page.</value>
+        int RegisterTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Search profile page.
+        /// </summary>
+        /// <value>TabdId of the Search Results page.</value>
+        int SearchTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Custom 404 page.
+        /// </summary>
+        /// <value>Tabid of the Custom 404 page.</value>
+        int Custom404TabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Custom 500 error page.
+        /// </summary>
+        /// <value>Tabid of the Custom 500 error page.</value>
+        int Custom500TabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Terms of Use page.
+        /// </summary>
+        /// <value>Tabid of the Terms of Use page.</value>
+        int TermsTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the Privacy Statement page.
+        /// </summary>
+        /// <value>Tabid of the Privacy Statement page.</value>
+        int PrivacyTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabdId of the splash page. If 0, there is no splash page.
+        /// </summary>
+        /// <value>TabdId of the Splash page.</value>
+        int SplashTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabId at which Host tasks start.
+        /// </summary>
+        /// <value>TabId of Host tasks.</value>
+        int SuperTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets number of registered users allowed in the portal. 0 means not limited.
+        /// </summary>
+        /// <value>Number of registered users allowed. </value>
+        int UserQuota { get; set; }
+
+        /// <summary>
+        /// Gets or sets type of registration that the portal supports.
+        /// </summary>
+        /// <value>Type of registration.</value>
+        int UserRegistration { get; set; }
+
+        /// <summary>
+        /// Gets or sets tabid of the User profile page.
+        /// </summary>
+        /// <value>TabdId of the User profile page.</value>
+        int UserTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the actual name of the Administrators group of the portal.
+        /// This name is retrieved from the RoleController object.
+        /// </summary>
+        /// <value>The name of the Administrators group.</value>
+        string AdministratorRoleName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the actual name of the Registerd Users group of the portal.
+        /// This name is retrieved from the RoleController object.
+        /// </summary>
+        /// <value>The name of the Registerd Users group.</value>
+        string RegisteredRoleName { get; set; }
+    }
+}
diff --git a/DNN Platform/DotNetNuke.Abstractions/README.md b/DNN Platform/DotNetNuke.Abstractions/README.md
new file mode 100644
index 00000000000..b50e6ae12a7
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/README.md	
@@ -0,0 +1,42 @@
+# DotNetNuke.Abstractions project
+
+This project is designed to house interfaces (and potentially other types
+supporting those interfaces).  This project has no dependencies (i.e. it does
+_not_ reference other DotNetNuke projects) and is designed to serve as a
+foundation upon which other components can build.  Most of the interfaces
+defined in this project will eventually be exposed via
+[dependency injection](../DotNetNuke.DependencyInjection).
+
+This project targets
+[.NET Standard](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
+2.0, meaning that it is compatible with both .NET Framework and .NET Core.  Any
+interfaces defined in this project cannot reference types which are only
+available to .NET Framework (for example, types in the `System.Web` namespace).
+
+## Structure
+
+This project is an opportunity to rethink some of the core structure of DNN
+Platform, so we are striving to strike a balance which does not give up on
+consistency and familiarity but also encourages cleaner, simpler,
+better named interfaces.  To that end, we're hoping to reduce some of the
+unnecessary nesting of namespaces for core types.  For example, instead of
+`DotNetNuke.Entities.Users.UserInfo`, we have
+`DotNetNuke.Abstractions.Users.IUserInfo`.  In particular, the `Entities`
+namespace is confusing and will not be continued in this project.  We plan to
+only have one level of namespace nesting (e.g. `Users` or `Portals`) within this
+project, and will also have interfaces without any namespace nesting when
+appropriate (e.g. `DotNetNuke.Abstractions.INavigationManager`).
+
+When possible, the interfaces introduced into this project should not solely be
+a copy of an existing interface or class.  In particular, large interfaces
+should be broken up into multiple, smaller interfaces.  This will simplify usage
+and give more flexibility in overriding components.
+
+## Naming
+
+While changes in naming can cause some minor disruption for developers familiar
+with the history of DNN Platform, we aim to introduce simpler and more
+forward-looking naming.  For example, the methods of the `IHostController`
+interface could be renamed to `IHostSettingsService`.  Using `Service` instead
+of `Controller` as the suffix aligns with modern .NET practices and avoids
+confusion with MVC and Web API controllers.
diff --git a/DNN Platform/DotNetNuke.Abstractions/Settings/IConfigurationSetting.cs b/DNN Platform/DotNetNuke.Abstractions/Settings/IConfigurationSetting.cs
new file mode 100644
index 00000000000..056652d0b35
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/Settings/IConfigurationSetting.cs	
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Settings
+{
+    /// <summary>
+    /// The configuration setting.
+    /// </summary>
+    public interface IConfigurationSetting
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether if the configuration setting is secure.
+        /// </summary>
+        bool IsSecure { get; set; }
+
+        /// <summary>
+        /// Gets or sets the configuration key.
+        /// </summary>
+        string Key { get; set; }
+
+        /// <summary>
+        /// Gets or sets the configuraiton value.
+        /// </summary>
+        string Value { get; set; }
+    }
+}
diff --git a/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs b/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs
new file mode 100644
index 00000000000..06eb7a6669f
--- /dev/null
+++ b/DNN Platform/DotNetNuke.Abstractions/Urls/BrowserTypes.cs	
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Urls
+{
+    /// <summary>
+    /// Browser Types
+    /// </summary>
+    public enum BrowserTypes
+    {
+        /// <summary>
+        /// Standard web browser.
+        /// </summary>
+        Normal = 0,
+
+        /// <summary>
+        /// Mobile web browser
+        /// </summary>
+        Mobile = 1,
+    }
+}
diff --git a/DNN Platform/DotNetNuke.DependencyInjection/README.md b/DNN Platform/DotNetNuke.DependencyInjection/README.md
new file mode 100644
index 00000000000..3c8b9f08eb4
--- /dev/null
+++ b/DNN Platform/DotNetNuke.DependencyInjection/README.md	
@@ -0,0 +1,59 @@
+# DotNetNuke.DependencyInjection project
+
+This project exposes `IDnnStartup`, which any component can implement in order
+to register services with DNN's dependency injection container.  It also exposes
+an extension method on the `Assembly` class, `SafeGetTypes`, which gets all of
+the `Type` objects from the assembly while handling potential load errors.
+
+This project targets
+[.NET Standard](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
+2.0, meaning that it is compatible with both .NET Framework and .NET Core.  Any
+interfaces defined in this project cannot reference types which are only
+available to .NET Framework (for example, types in the `System.Web` namespace).
+
+## Requesting Dependencies
+
+DNN supports dependency injection for all of the major module patterns, and is
+in the process of adding support in other areas.
+
+Within a Web API controller or MVC controller, requesting a type from the
+dependency injection container is simple.  Add a constructor to the controller
+class, and any constructor arguments which can be resolved from the container
+will be provided automatically.  For example:
+
+```csharp
+public class MyController : DnnApiController
+{
+    private readonly INavigationManager navigationManager;
+
+    public MyController(INavigationManager navigationManager)
+    {
+        this.navigationManager = navigationManager;
+    }
+
+}
+```
+
+## Registering Dependencies
+
+In addition to the types that DNN automatically adds to the dependency injection
+container, developers can register their own types as well.  Simply create a
+class that implements `IDnnStartup` and use the `ConfigureServices` method to
+add registrations to the collection of services.  For example:
+
+```csharp
+public class Startup : IDnnStartup
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IMyEmailCommunicator, MyEmailCommunicator>();
+    }
+}
+```
+
+In this example, the `MyEmailCommunicator` class is mapped to the
+`IMyEmailCommunicator` interface, using the _scoped_ lifetime.  It is also
+possible to register concrete types directly, or register factory methods or
+specific instances.  A registration will use one of the three available
+lifetimes, `Transient` (a new instance every time), `Scoped` (a new instance for
+each scope, e.g. web request), or `Singleton` (a single shared instance).
diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj
index 607abd82722..1cb62a5bbc7 100644
--- a/DNN Platform/Library/DotNetNuke.Library.csproj	
+++ b/DNN Platform/Library/DotNetNuke.Library.csproj	
@@ -251,6 +251,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Entities\Users\UserRegistrationEmailNotifier.cs" />
+    <Compile Include="Obsolete\HostController.cs" />
     <Compile Include="Obsolete\PortalSettings.cs" />
     <Compile Include="Prompt\Command.cs" />
     <Compile Include="Prompt\Output\CommandHelp.cs" />
diff --git a/DNN Platform/Library/Entities/ConfigurationSetting.cs b/DNN Platform/Library/Entities/ConfigurationSetting.cs
index 77fbd81d5db..329cadc6e9d 100644
--- a/DNN Platform/Library/Entities/ConfigurationSetting.cs	
+++ b/DNN Platform/Library/Entities/ConfigurationSetting.cs	
@@ -2,14 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Entities
-{
-    public class ConfigurationSetting
-    {
-        public bool IsSecure { get; set; }
-
-        public string Key { get; set; }
-
-        public string Value { get; set; }
-    }
-}
+namespace DotNetNuke.Entities
+{
+    using DotNetNuke.Abstractions.Settings;
+
+    /// <inheritdoc />
+    public class ConfigurationSetting : IConfigurationSetting
+    {
+        /// <inheritdoc />
+        public bool IsSecure { get; set; }
+
+        /// <inheritdoc />
+        public string Key { get; set; }
+
+        /// <inheritdoc />
+        public string Value { get; set; }
+    }
+}
diff --git a/DNN Platform/Library/Entities/Controllers/HostController.cs b/DNN Platform/Library/Entities/Controllers/HostController.cs
index 5a634996629..8fe9fa52cad 100644
--- a/DNN Platform/Library/Entities/Controllers/HostController.cs	
+++ b/DNN Platform/Library/Entities/Controllers/HostController.cs	
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
+
 namespace DotNetNuke.Entities.Controllers
 {
     using System;
@@ -9,9 +10,10 @@ namespace DotNetNuke.Entities.Controllers
     using System.Globalization;
     using System.Linq;
 
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Abstractions.Settings;
     using DotNetNuke.Common;
     using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
     using DotNetNuke.Data;
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Entities.Users;
@@ -20,49 +22,25 @@ namespace DotNetNuke.Entities.Controllers
     using DotNetNuke.Services.Log.EventLog;
     using DotNetNuke.Web.Client;
 
-    /// <summary>
-    /// HostController provides business layer of host settings.
-    /// </summary>
-    /// <example>
-    /// <code lang="C#">
-    /// public static bool CheckUpgrade
-    /// {
-    ///     get
-    ///     {
-    ///         return HostController.Instance.GetBoolean("CheckUpgrade", true);
-    ///     }
-    /// }
-    /// </code>
-    /// </example>
-    public class HostController : ComponentBase<IHostController, HostController>, IHostController
+    /// <inheritdoc/>
+    public partial class HostController : IHostSettingsService
     {
         private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(HostController));
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HostController"/> class.
         /// </summary>
-        internal HostController()
+        public HostController()
         {
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public bool GetBoolean(string key)
         {
             return this.GetBoolean(key, Null.NullBoolean);
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public bool GetBoolean(string key, bool defaultValue)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -95,24 +73,13 @@ public bool GetBoolean(string key, bool defaultValue)
             return retValue;
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public double GetDouble(string key)
         {
             return this.GetDouble(key, Null.NullDouble);
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public double GetDouble(string key, double defaultValue)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -127,24 +94,13 @@ public double GetDouble(string key, double defaultValue)
             return retValue;
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public int GetInteger(string key)
         {
             return this.GetInteger(key, Null.NullInteger);
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public int GetInteger(string key, int defaultValue)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -159,36 +115,25 @@ public int GetInteger(string key, int defaultValue)
             return retValue;
         }
 
-        /// <summary>
-        /// Gets all host settings.
-        /// </summary>
-        /// <returns>host setting.</returns>
-        public Dictionary<string, ConfigurationSetting> GetSettings()
+        /// <inheritdoc/>
+        Dictionary<string, IConfigurationSetting> IHostSettingsService.GetSettings()
         {
-            return CBO.GetCachedObject<Dictionary<string, ConfigurationSetting>>(
+            return CBO.GetCachedObject<Dictionary<string, IConfigurationSetting>>(
                                             new CacheItemArgs(
                                                 DataCache.HostSettingsCacheKey,
                                                 DataCache.HostSettingsCacheTimeOut,
                                                 DataCache.HostSettingsCachePriority),
-                                            GetSettingsDictionaryCallBack,
+                                            this.GetSettingsDictionaryCallBack,
                                             true);
         }
 
-        /// <summary>
-        /// Gets all host settings as dictionary.
-        /// </summary>
-        /// <returns>host setting's value.</returns>
+        /// <inheritdoc/>
         public Dictionary<string, string> GetSettingsDictionary()
         {
             return this.GetSettings().ToDictionary(c => c.Key, c => c.Value.Value);
         }
 
-        /// <summary>
-        /// takes in a text value, decrypts it with a FIPS compliant algorithm and returns the value.
-        /// </summary>
-        /// <param name="key">the host setting to read.</param>
-        /// <param name="passPhrase">the pass phrase used for encryption/decryption.</param>
-        /// <returns>The setting value as a <see cref="string"/>.</returns>
+        /// <inheritdoc/>
         public string GetEncryptedString(string key, string passPhrase)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -197,24 +142,13 @@ public string GetEncryptedString(string key, string passPhrase)
             return Security.FIPSCompliant.DecryptAES(cipherText, passPhrase, Entities.Host.Host.GUID);
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public string GetString(string key)
         {
             return this.GetString(key, string.Empty);
         }
 
-        /// <summary>
-        /// Gets the setting value by the specific key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="defaultValue">this value will be return if setting's value is empty.</param>
-        /// <returns>host setting's value.</returns>
-        /// <exception cref="System.ArgumentException">key is empty.</exception>
+        /// <inheritdoc/>
         public string GetString(string key, string defaultValue)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -227,10 +161,7 @@ public string GetString(string key, string defaultValue)
             return this.GetSettings()[key].Value;
         }
 
-        /// <summary>
-        /// Updates the specified settings.
-        /// </summary>
-        /// <param name="settings">The settings.</param>
+        /// <inheritdoc/>
         public void Update(Dictionary<string, string> settings)
         {
             foreach (KeyValuePair<string, string> settingKvp in settings)
@@ -241,21 +172,14 @@ public void Update(Dictionary<string, string> settings)
             DataCache.ClearHostCache(false);
         }
 
-        /// <summary>
-        /// Updates the specified config.
-        /// </summary>
-        /// <param name="config">The config.</param>
-        public void Update(ConfigurationSetting config)
+        /// <inheritdoc/>
+        public void Update(IConfigurationSetting config)
         {
             this.Update(config, true);
         }
 
-        /// <summary>
-        /// Updates the specified config.
-        /// </summary>
-        /// <param name="config">The config.</param>
-        /// <param name="clearCache">if set to <c>true</c> will clear cache after updating the setting.</param>
-        public void Update(ConfigurationSetting config, bool clearCache)
+        /// <inheritdoc/>
+        public void Update(IConfigurationSetting config, bool clearCache)
         {
             try
             {
@@ -265,7 +189,7 @@ public void Update(ConfigurationSetting config, bool clearCache)
                 var settings = GetSettingsFromDatabase();
                 if (settings.ContainsKey(config.Key))
                 {
-                    ConfigurationSetting currentconfig;
+                    IConfigurationSetting currentconfig;
                     settings.TryGetValue(config.Key, out currentconfig);
                     if (currentconfig != null && currentconfig.Value != config.Value)
                     {
@@ -300,33 +224,19 @@ public void Update(ConfigurationSetting config, bool clearCache)
             }
         }
 
-        /// <summary>
-        /// Updates the specified key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="clearCache">if set to <c>true</c> will clear cache after update settings.</param>
+        /// <inheritdoc/>
         public void Update(string key, string value, bool clearCache)
         {
             this.Update(new ConfigurationSetting { Key = key, Value = value }, clearCache);
         }
 
-        /// <summary>
-        /// Updates the setting for a specified key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The value.</param>
+        /// <inheritdoc/>
         public void Update(string key, string value)
         {
             this.Update(key, value, true);
         }
 
-        /// <summary>
-        /// Takes in a <see cref="string"/> value, encrypts it with a FIPS compliant algorithm and stores it.
-        /// </summary>
-        /// <param name="key">host settings key.</param>
-        /// <param name="value">host settings value.</param>
-        /// <param name="passPhrase">pass phrase to allow encryption/decryption.</param>
+        /// <inheritdoc/>
         public void UpdateEncryptedString(string key, string value, string passPhrase)
         {
             Requires.NotNullOrEmpty("key", key);
@@ -336,10 +246,7 @@ public void UpdateEncryptedString(string key, string value, string passPhrase)
             this.Update(key, cipherText);
         }
 
-        /// <summary>
-        /// Increments the Client Resource Manager (CRM) version to bust local cache.
-        /// </summary>
-        /// <param name="includeOverridingPortals">If true also forces a CRM version increment on portals that have non-default settings for CRM.</param>
+        /// <inheritdoc/>
         public void IncrementCrmVersion(bool includeOverridingPortals)
         {
             var currentVersion = Host.Host.CrmVersion;
@@ -356,9 +263,9 @@ public void IncrementCrmVersion(bool includeOverridingPortals)
         /// Gets all settings from the databse.
         /// </summary>
         /// <returns><see cref="Dictionary{TKey, TValue}"/></returns>
-        private static Dictionary<string, ConfigurationSetting> GetSettingsFromDatabase()
+        private Dictionary<string, IConfigurationSetting> GetSettingsFromDatabase()
         {
-            var dicSettings = new Dictionary<string, ConfigurationSetting>();
+            var dicSettings = new Dictionary<string, IConfigurationSetting>();
             IDataReader dr = null;
             try
             {
@@ -388,9 +295,9 @@ private static Dictionary<string, ConfigurationSetting> GetSettingsFromDatabase(
             return dicSettings;
         }
 
-        private static object GetSettingsDictionaryCallBack(CacheItemArgs cacheItemArgs)
+        private object GetSettingsDictionaryCallBack(CacheItemArgs cacheItemArgs)
         {
-            return GetSettingsFromDatabase();
+            return this.GetSettingsFromDatabase();
         }
     }
 }
diff --git a/DNN Platform/Library/Entities/Controllers/IHostController.cs b/DNN Platform/Library/Entities/Controllers/IHostController.cs
index ad1d48b8a55..2c4fde9682b 100644
--- a/DNN Platform/Library/Entities/Controllers/IHostController.cs	
+++ b/DNN Platform/Library/Entities/Controllers/IHostController.cs	
@@ -1,8 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
+
 namespace DotNetNuke.Entities.Controllers
-{
+{
+    using System;
     using System.Collections.Generic;
 
     /// <summary>
@@ -20,6 +22,7 @@ namespace DotNetNuke.Entities.Controllers
     /// </code>
     /// </example>
     /// <seealso cref="HostController"/>
+    [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
     public interface IHostController
     {
         /// <summary>
@@ -27,6 +30,7 @@ public interface IHostController
         /// </summary>
         /// <param name="key">The setting key string.</param>
         /// <returns>host setting as a boolean.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         bool GetBoolean(string key);
 
         /// <summary>
@@ -35,6 +39,7 @@ public interface IHostController
         /// <param name="key">The setting key string.</param>
         /// <param name="defaultValue">Default value returned if the setting is not found or not compatible with the requested type.</param>
         /// <returns>host setting or the provided default value as a <see cref="bool"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         bool GetBoolean(string key, bool defaultValue);
 
         /// <summary>
@@ -43,6 +48,7 @@ public interface IHostController
         /// <param name="key">The setting key string.</param>
         /// <param name="defaultValue">Default value returned if the setting is not found or not compatible with the requested type.</param>
         /// <returns>Host setting or the provided default value as a <see cref="double"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         double GetDouble(string key, double defaultValue);
 
         /// <summary>
@@ -50,6 +56,7 @@ public interface IHostController
         /// </summary>
         /// <param name="key">The setting key string.</param>
         /// <returns>Host setting as a <see cref="double"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         double GetDouble(string key);
 
         /// <summary>
@@ -57,6 +64,7 @@ public interface IHostController
         /// </summary>
         /// <param name="key">The setting key string.</param>
         /// <returns>Host setting as an <see cref="int"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         int GetInteger(string key);
 
         /// <summary>
@@ -65,18 +73,21 @@ public interface IHostController
         /// <param name="key">The setting key string.</param>
         /// <param name="defaultValue">Default value returned if the setting is not found or not compatible with the requested type.</param>
         /// <returns>Host setting or provided default value as a <see cref="int"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         int GetInteger(string key, int defaultValue);
 
         /// <summary>
         /// Gets the host settings.
         /// </summary>
         /// <returns>Host settings as a <see cref="Dictionary{TKey, TValue}"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         Dictionary<string, ConfigurationSetting> GetSettings();
 
         /// <summary>
         /// Gets the host settings.
         /// </summary>
         /// <returns>Host settings as a <see cref="Dictionary{TKey, TValue}"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         Dictionary<string, string> GetSettingsDictionary();
 
         /// <summary>
@@ -85,6 +96,7 @@ public interface IHostController
         /// <param name="key">The setting key string.</param>
         /// <param name="passPhrase">The passPhrase used to decrypt the setting value.</param>
         /// <returns>The setting value as a <see cref="string"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         string GetEncryptedString(string key, string passPhrase);
 
         /// <summary>
@@ -92,6 +104,7 @@ public interface IHostController
         /// </summary>
         /// <param name="key">The setting key string.</param>
         /// <returns>The setting value as a <see cref="string"/>.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         string GetString(string key);
 
         /// <summary>
@@ -100,18 +113,21 @@ public interface IHostController
         /// <param name="key">The seeting key string.</param>
         /// <param name="defaultValue"></param>
         /// <returns>Default value returned if the setting is not found.</returns>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         string GetString(string key, string defaultValue);
 
         /// <summary>
         /// Updates the specified settings.
         /// </summary>
         /// <param name="settings">The settings to update.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void Update(Dictionary<string, string> settings);
 
         /// <summary>
         /// Updates the specified config.
         /// </summary>
         /// <param name="config">The configuration setting.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void Update(ConfigurationSetting config);
 
         /// <summary>
@@ -119,6 +135,7 @@ public interface IHostController
         /// </summary>
         /// <param name="config">The configuaration setting.</param>
         /// <param name="clearCache">If set to <c>true</c>, will clear the cache after updating the setting.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void Update(ConfigurationSetting config, bool clearCache);
 
         /// <summary>
@@ -127,6 +144,7 @@ public interface IHostController
         /// <param name="key">The setting key string.</param>
         /// <param name="value">The value to update.</param>
         /// <param name="clearCache">If set to <c>true</c>, will clear the cache after updating the setting.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void Update(string key, string value, bool clearCache);
 
         /// <summary>
@@ -134,6 +152,7 @@ public interface IHostController
         /// </summary>
         /// <param name="key">The setting key string.</param>
         /// <param name="value">The value to update.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void Update(string key, string value);
 
         /// <summary>
@@ -142,12 +161,14 @@ public interface IHostController
         /// <param name="key">host settings key.</param>
         /// <param name="value">host settings value.</param>
         /// <param name="passPhrase">pass phrase to allow encryption/decryption.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void UpdateEncryptedString(string key, string value, string passPhrase);
 
         /// <summary>
         /// Increments the Client Resource Manager (CRM) version to bust local cache.
         /// </summary>
         /// <param name="includeOverridingPortals">If true also forces a CRM version increment on portals that have non-default settings for CRM.</param>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Controllers.IHostController instead.")]
         void IncrementCrmVersion(bool includeOverridingPortals);
     }
 }
diff --git a/DNN Platform/Library/Entities/Portals/PortalAliasCollection.cs b/DNN Platform/Library/Entities/Portals/PortalAliasCollection.cs
index 74173de8aae..8dcc459bbe4 100644
--- a/DNN Platform/Library/Entities/Portals/PortalAliasCollection.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalAliasCollection.cs	
@@ -1,68 +1,76 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-namespace DotNetNuke.Entities.Portals
-{
-    using System;
+
+namespace DotNetNuke.Entities.Portals
+{
+    using System;
     using System.Collections;
 
-    [Serializable]
-    public class PortalAliasCollection : DictionaryBase
-    {
-        /// <summary>
-        /// Gets a value indicating whether gets a value indicating if the collection contains keys that are not null.
-        /// </summary>
-        public bool HasKeys
-        {
-            get
-            {
-                return this.Dictionary.Keys.Count > 0;
-            }
-        }
-
-        public ICollection Keys
-        {
-            get
-            {
-                return this.Dictionary.Keys;
-            }
-        }
-
-        public ICollection Values
-        {
-            get
-            {
-                return this.Dictionary.Values;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value associated with the specified key.
-        /// </summary>
-        public PortalAliasInfo this[string key]
-        {
-            get
-            {
-                return (PortalAliasInfo)this.Dictionary[key];
-            }
-
-            set
-            {
-                this.Dictionary[key] = value;
-            }
-        }
-
-        public bool Contains(string key)
-        {
-            return this.Dictionary.Contains(key);
-        }
-
-        /// <summary>
-        /// Adds an entry to the collection.
-        /// </summary>
-        public void Add(string key, PortalAliasInfo value)
-        {
-            this.Dictionary.Add(key, value);
-        }
-    }
-}
+    [Serializable]
+    [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+    public class PortalAliasCollection : DictionaryBase
+    {
+        /// <summary>
+        /// Gets a value indicating whether gets a value indicating if the collection contains keys that are not null.
+        /// </summary>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public bool HasKeys
+        {
+            get
+            {
+                return this.Dictionary.Keys.Count > 0;
+            }
+        }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public ICollection Keys
+        {
+            get
+            {
+                return this.Dictionary.Keys;
+            }
+        }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public ICollection Values
+        {
+            get
+            {
+                return this.Dictionary.Values;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value associated with the specified key.
+        /// </summary>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public PortalAliasInfo this[string key]
+        {
+            get
+            {
+                return (PortalAliasInfo)this.Dictionary[key];
+            }
+
+            set
+            {
+                this.Dictionary[key] = value;
+            }
+        }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public bool Contains(string key)
+        {
+            return this.Dictionary.Contains(key);
+        }
+
+        /// <summary>
+        /// Adds an entry to the collection.
+        /// </summary>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use IDictionary<string, IPortalAliasInfo> instead.")]
+        public void Add(string key, PortalAliasInfo value)
+        {
+            this.Dictionary.Add(key, value);
+        }
+    }
+}
diff --git a/DNN Platform/Library/Entities/Portals/PortalAliasController.cs b/DNN Platform/Library/Entities/Portals/PortalAliasController.cs
index 7c18ed79823..6fb8cf402a9 100644
--- a/DNN Platform/Library/Entities/Portals/PortalAliasController.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalAliasController.cs	
@@ -1,390 +1,358 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-namespace DotNetNuke.Entities.Portals
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Internal;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Portals.Internal;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Entities.Urls;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Framework;
+namespace DotNetNuke.Entities.Portals
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Internal;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Entities.Urls;
+    using DotNetNuke.Entities.Users;
     using DotNetNuke.Services.Log.EventLog;
 
-    /// <summary>
-    /// PortalAliasController provides method to manage portal alias.
-    /// </summary>
-    /// <remarks>
-    /// For DotNetNuke to know what site a request should load, it uses a system of portal aliases.
-    /// When a request is recieved by DotNetNuke from IIS, it extracts the domain name portion and does a comparison against
-    /// the list of portal aliases and then redirects to the relevant portal to load the approriate page.
-    /// </remarks>
-    public partial class PortalAliasController : ServiceLocator<IPortalAliasController, PortalAliasController>, IPortalAliasController
-    {
-        /// <summary>
-        /// Gets the portal alias by portal.
-        /// </summary>
-        /// <param name="portalId">The portal id.</param>
-        /// <param name="portalAlias">The portal alias.</param>
-        /// <returns>Portal alias.</returns>
-        public static string GetPortalAliasByPortal(int portalId, string portalAlias)
-        {
-            string retValue = string.Empty;
-            bool foundAlias = false;
-            PortalAliasInfo portalAliasInfo = Instance.GetPortalAlias(portalAlias, portalId);
-            if (portalAliasInfo != null)
-            {
-                retValue = portalAliasInfo.HTTPAlias;
-                foundAlias = true;
-            }
-
-            if (!foundAlias)
-            {
-                // searching from longest to shortest alias ensures that the most specific portal is matched first
-                // In some cases this method has been called with "portalaliases" that were not exactly the real portal alias
-                // the startswith behaviour is preserved here to support those non-specific uses
-                var controller = new PortalAliasController();
-                var portalAliases = controller.GetPortalAliasesInternal();
-                var portalAliasCollection = portalAliases.OrderByDescending(k => k.Key.Length);
-
-                foreach (var currentAlias in portalAliasCollection)
-                {
-                    // check if the alias key starts with the portal alias value passed in - we use
-                    // StartsWith because child portals are redirected to the parent portal domain name
-                    // eg. child = 'www.domain.com/child' and parent is 'www.domain.com'
-                    // this allows the parent domain name to resolve to the child alias ( the tabid still identifies the child portalid )
-                    string httpAlias = currentAlias.Value.HTTPAlias.ToLowerInvariant();
-                    if (httpAlias.StartsWith(portalAlias.ToLowerInvariant()) && currentAlias.Value.PortalID == portalId)
-                    {
-                        retValue = currentAlias.Value.HTTPAlias;
-                        break;
-                    }
-
-                    httpAlias = httpAlias.StartsWith("www.") ? httpAlias.Replace("www.", string.Empty) : string.Concat("www.", httpAlias);
-                    if (httpAlias.StartsWith(portalAlias.ToLowerInvariant()) && currentAlias.Value.PortalID == portalId)
-                    {
-                        retValue = currentAlias.Value.HTTPAlias;
-                        break;
-                    }
-                }
-            }
-
-            return retValue;
-        }
-
-        /// <summary>
-        /// Gets the portal alias by tab.
-        /// </summary>
-        /// <param name="tabId">The tab ID.</param>
-        /// <param name="portalAlias">The portal alias.</param>
-        /// <returns>Portal alias.</returns>
-        public static string GetPortalAliasByTab(int tabId, string portalAlias)
-        {
-            string retValue = Null.NullString;
-            int intPortalId = -2;
-
-            // get the tab
-            TabInfo tab = TabController.Instance.GetTab(tabId, Null.NullInteger);
-            if (tab != null)
-            {
-                // ignore deleted tabs
-                if (!tab.IsDeleted)
-                {
-                    intPortalId = tab.PortalID;
-                }
-            }
-
-            switch (intPortalId)
-            {
-                case -2: // tab does not exist
-                    break;
-                case -1: // host tab
-                    // host tabs are not verified to determine if they belong to the portal alias
-                    retValue = portalAlias;
-                    break;
-                default: // portal tab
-                    retValue = GetPortalAliasByPortal(intPortalId, portalAlias);
-                    break;
-            }
-
-            return retValue;
-        }
-
-        /// <summary>
-        /// Validates the alias.
-        /// </summary>
-        /// <param name="portalAlias">The portal alias.</param>
-        /// <param name="ischild">if set to <c>true</c> [ischild].</param>
-        /// <returns><c>true</c> if the alias is a valid url format; otherwise return <c>false</c>.</returns>
-        public static bool ValidateAlias(string portalAlias, bool ischild)
-        {
-            if (ischild)
-            {
-                return ValidateAlias(portalAlias, true, false);
-            }
-
-            // validate the domain
-            Uri result;
-            if (Uri.TryCreate(Globals.AddHTTP(portalAlias), UriKind.Absolute, out result))
-            {
-                return ValidateAlias(result.Host, false, true) && ValidateAlias(portalAlias, false, false);
-            }
-
-            return false;
-        }
-
-        public int AddPortalAlias(PortalAliasInfo portalAlias)
-        {
-            // Add Alias
-            var dataProvider = DataProvider.Instance();
-            int Id = dataProvider.AddPortalAlias(
-                portalAlias.PortalID,
-                portalAlias.HTTPAlias.ToLowerInvariant().Trim('/'),
-                portalAlias.CultureCode,
-                portalAlias.Skin,
-                portalAlias.BrowserType.ToString(),
-                portalAlias.IsPrimary,
-                UserController.Instance.GetCurrentUserInfo().UserID);
-
-            // Log Event
-            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_CREATED);
-
-            // clear portal alias cache
-            ClearCache(true);
-
-            return Id;
-        }
-
-        public void DeletePortalAlias(PortalAliasInfo portalAlias)
-        {
-            // Delete Alias
-            DataProvider.Instance().DeletePortalAlias(portalAlias.PortalAliasID);
-
-            // Log Event
-            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_DELETED);
-
-            // clear portal alias cache
-            ClearCache(false, portalAlias.PortalID);
-        }
-
-        public PortalAliasInfo GetPortalAlias(string alias)
-        {
-            return this.GetPortalAliasInternal(alias);
-        }
-
-        /// <summary>
-        /// Gets the portal alias.
-        /// </summary>
-        /// <param name="alias">The portal alias.</param>
-        /// <param name="portalId">The portal ID.</param>
-        /// <returns>Portal Alias Info.</returns>
-        public PortalAliasInfo GetPortalAlias(string alias, int portalId)
-        {
-            return this.GetPortalAliasesInternal().SingleOrDefault(pa => pa.Key.Equals(alias, StringComparison.InvariantCultureIgnoreCase) && pa.Value.PortalID == portalId).Value;
-        }
-
-        /// <summary>
-        /// Gets the portal alias by portal alias ID.
-        /// </summary>
-        /// <param name="portalAliasId">The portal alias ID.</param>
-        /// <returns>Portal alias info.</returns>
-        public PortalAliasInfo GetPortalAliasByPortalAliasID(int portalAliasId)
-        {
-            return this.GetPortalAliasesInternal().SingleOrDefault(pa => pa.Value.PortalAliasID == portalAliasId).Value;
-        }
-
-        public PortalAliasCollection GetPortalAliases()
-        {
-            var aliasCollection = new PortalAliasCollection();
-            foreach (var alias in this.GetPortalAliasesInternal().Values)
-            {
-                aliasCollection.Add(alias.HTTPAlias, alias);
-            }
-
-            return aliasCollection;
-        }
-
-        public IEnumerable<PortalAliasInfo> GetPortalAliasesByPortalId(int portalId)
-        {
-            return this.GetPortalAliasesInternal().Values.Where(alias => alias.PortalID == portalId).ToList();
-        }
-
-        /// <summary>
-        /// Gets the portal by portal alias ID.
-        /// </summary>
-        /// <param name="PortalAliasId">The portal alias id.</param>
-        /// <returns>Portal info.</returns>
-        public PortalInfo GetPortalByPortalAliasID(int PortalAliasId)
-        {
-            return CBO.FillObject<PortalInfo>(DataProvider.Instance().GetPortalByPortalAliasID(PortalAliasId));
-        }
-
-        public void UpdatePortalAlias(PortalAliasInfo portalAlias)
-        {
-            // Update Alias
-            DataProvider.Instance().UpdatePortalAliasInfo(
-                portalAlias.PortalAliasID,
-                portalAlias.PortalID,
-                portalAlias.HTTPAlias.ToLowerInvariant().Trim('/'),
-                portalAlias.CultureCode,
-                portalAlias.Skin,
-                portalAlias.BrowserType.ToString(),
-                portalAlias.IsPrimary,
-                UserController.Instance.GetCurrentUserInfo().UserID);
-
-            // Log Event
-            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_UPDATED);
-
-            // clear portal alias cache
-            ClearCache(false);
-        }
-
-        internal Dictionary<string, PortalAliasInfo> GetPortalAliasesInternal()
-        {
-            return CBO.GetCachedObject<Dictionary<string, PortalAliasInfo>>(
-                new CacheItemArgs(
-                DataCache.PortalAliasCacheKey,
-                DataCache.PortalAliasCacheTimeOut,
-                DataCache.PortalAliasCachePriority),
-                c =>
-                                                                {
-                                                                    var dic = CBO.FillDictionary<string, PortalAliasInfo>(
-                                                                        "HTTPAlias",
-                                                                        DataProvider.Instance().GetPortalAliases());
-                                                                    return dic.Keys.ToDictionary(key => key.ToLowerInvariant(), key => dic[key]);
-                                                                },
-                true);
-        }
-
-        protected override Func<IPortalAliasController> GetFactory()
-        {
-            return () => new PortalAliasController();
-        }
-
-        private static void ClearCache(bool refreshServiceRoutes, int portalId = -1)
-        {
-            DataCache.RemoveCache(DataCache.PortalAliasCacheKey);
-            CacheController.FlushPageIndexFromCache();
-
-            if (portalId > Null.NullInteger)
-            {
-                DataCache.ClearTabsCache(portalId);
-            }
-
-            if (refreshServiceRoutes)
-            {
-                ServicesRoutingManager.ReRegisterServiceRoutesWhileSiteIsRunning();
-            }
-        }
-
-        private static void LogEvent(PortalAliasInfo portalAlias, EventLogController.EventLogType logType)
-        {
-            int userId = UserController.Instance.GetCurrentUserInfo().UserID;
-            EventLogController.Instance.AddLog(portalAlias, PortalController.Instance.GetCurrentPortalSettings(), userId, string.Empty, logType);
-        }
-
-        private static bool ValidateAlias(string portalAlias, bool ischild, bool isDomain)
-        {
-            string validChars = "abcdefghijklmnopqrstuvwxyz0123456789-/";
-            if (!ischild)
-            {
-                validChars += ".:";
-            }
-
-            if (!isDomain)
-            {
-                validChars += "_";
-            }
-
-            return portalAlias.All(c => validChars.Contains(c.ToString()));
-        }
-
-        private PortalAliasInfo GetPortalAliasLookupInternal(string alias)
-        {
-            return this.GetPortalAliasesInternal().SingleOrDefault(pa => pa.Key == alias).Value;
-        }
-
-        private PortalAliasInfo GetPortalAliasInternal(string httpAlias)
-        {
-            string strPortalAlias;
-
-            // try the specified alias first
-            PortalAliasInfo portalAlias = this.GetPortalAliasLookupInternal(httpAlias.ToLowerInvariant());
-
-            // domain.com and www.domain.com should be synonymous
-            if (portalAlias == null)
-            {
-                if (httpAlias.StartsWith("www.", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    // try alias without the "www." prefix
-                    strPortalAlias = httpAlias.Replace("www.", string.Empty);
-                }
-                else // try the alias with the "www." prefix
-                {
-                    strPortalAlias = string.Concat("www.", httpAlias);
-                }
-
-                // perform the lookup
-                portalAlias = this.GetPortalAliasLookupInternal(strPortalAlias.ToLowerInvariant());
-            }
-
-            // allow domain wildcards
-            if (portalAlias == null)
-            {
-                // remove the domain prefix ( ie. anything.domain.com = domain.com )
-                if (httpAlias.IndexOf(".", StringComparison.Ordinal) != -1)
-                {
-                    strPortalAlias = httpAlias.Substring(httpAlias.IndexOf(".", StringComparison.Ordinal) + 1);
-                }
-                else // be sure we have a clean string (without leftovers from preceding 'if' block)
-                {
-                    strPortalAlias = httpAlias;
-                }
-
-                // try an explicit lookup using the wildcard entry ( ie. *.domain.com )
-                portalAlias = this.GetPortalAliasLookupInternal("*." + strPortalAlias.ToLowerInvariant()) ??
-                              this.GetPortalAliasLookupInternal(strPortalAlias.ToLowerInvariant());
-
-                if (portalAlias == null)
-                {
-                    // try a lookup using "www." + raw domain
-                    portalAlias = this.GetPortalAliasLookupInternal("www." + strPortalAlias.ToLowerInvariant());
-                }
-            }
-
-            if (portalAlias == null)
-            {
-                // check if this is a fresh install ( no alias values in collection )
-                var controller = new PortalAliasController();
-                var portalAliases = controller.GetPortalAliasesInternal();
-                if (portalAliases.Keys.Count == 0 || (portalAliases.Count == 1 && portalAliases.ContainsKey("_default")))
-                {
-                    // relate the PortalAlias to the default portal on a fresh database installation
-                    DataProvider.Instance().UpdatePortalAlias(httpAlias.ToLowerInvariant().Trim('/'), UserController.Instance.GetCurrentUserInfo().UserID);
-                    EventLogController.Instance.AddLog(
-                        "PortalAlias",
-                        httpAlias,
-                        PortalController.Instance.GetCurrentPortalSettings(),
-                        UserController.Instance.GetCurrentUserInfo().UserID,
-                        EventLogController.EventLogType.PORTALALIAS_UPDATED);
-
-                    // clear the cachekey "GetPortalByAlias" otherwise portalalias "_default" stays in cache after first install
-                    DataCache.RemoveCache("GetPortalByAlias");
-
-                    // try again
-                    portalAlias = this.GetPortalAliasLookupInternal(httpAlias.ToLowerInvariant());
-                }
-            }
-
-            return portalAlias;
-        }
-    }
-}
+    /// <summary>
+    /// PortalAliasController provides method to manage portal alias.
+    /// </summary>
+    /// <remarks>
+    /// For DotNetNuke to know what site a request should load, it uses a system of portal aliases.
+    /// When a request is recieved by DotNetNuke from IIS, it extracts the domain name portion and does a comparison against
+    /// the list of portal aliases and then redirects to the relevant portal to load the approriate page.
+    /// </remarks>
+    public partial class PortalAliasController : IPortalAliasService
+    {
+        /// <inheritdoc/>
+        string IPortalAliasService.GetPortalAliasByPortal(int portalId, string portalAlias)
+        {
+            string retValue = string.Empty;
+            bool foundAlias = false;
+            PortalAliasInfo portalAliasInfo = this.GetPortalAlias(portalAlias, portalId);
+            if (portalAliasInfo != null)
+            {
+                retValue = portalAliasInfo.HttpAlias;
+                foundAlias = true;
+            }
+
+            if (!foundAlias)
+            {
+                // searching from longest to shortest alias ensures that the most specific portal is matched first
+                // In some cases this method has been called with "portalaliases" that were not exactly the real portal alias
+                // the startswith behaviour is preserved here to support those non-specific uses
+                var controller = new PortalAliasController();
+                var portalAliases = controller.GetPortalAliasesInternal();
+                var portalAliasCollection = portalAliases.OrderByDescending(k => k.Key.Length);
+
+                foreach (var currentAlias in portalAliasCollection)
+                {
+                    // check if the alias key starts with the portal alias value passed in - we use
+                    // StartsWith because child portals are redirected to the parent portal domain name
+                    // eg. child = 'www.domain.com/child' and parent is 'www.domain.com'
+                    // this allows the parent domain name to resolve to the child alias ( the tabid still identifies the child portalid )
+                    string httpAlias = currentAlias.Value.HttpAlias.ToLowerInvariant();
+                    if (httpAlias.StartsWith(portalAlias.ToLowerInvariant()) && currentAlias.Value.PortalId == portalId)
+                    {
+                        retValue = currentAlias.Value.HttpAlias;
+                        break;
+                    }
+
+                    httpAlias = httpAlias.StartsWith("www.") ? httpAlias.Replace("www.", string.Empty) : string.Concat("www.", httpAlias);
+                    if (httpAlias.StartsWith(portalAlias.ToLowerInvariant()) && currentAlias.Value.PortalId == portalId)
+                    {
+                        retValue = currentAlias.Value.HttpAlias;
+                        break;
+                    }
+                }
+            }
+
+            return retValue;
+        }
+
+        /// <inheritdoc/>
+        string IPortalAliasService.GetPortalAliasByTab(int tabId, string portalAlias)
+        {
+            string retValue = Null.NullString;
+            int intPortalId = -2;
+
+            // get the tab
+            TabInfo tab = TabController.Instance.GetTab(tabId, Null.NullInteger);
+            if (tab != null)
+            {
+                // ignore deleted tabs
+                if (!tab.IsDeleted)
+                {
+                    intPortalId = tab.PortalID;
+                }
+            }
+
+            switch (intPortalId)
+            {
+                case -2: // tab does not exist
+                    break;
+                case -1: // host tab
+                    // host tabs are not verified to determine if they belong to the portal alias
+                    retValue = portalAlias;
+                    break;
+                default: // portal tab
+                    retValue = GetPortalAliasByPortal(intPortalId, portalAlias);
+                    break;
+            }
+
+            return retValue;
+        }
+
+        /// <inheritdoc />
+        bool IPortalAliasService.ValidateAlias(string portalAlias, bool isChild)
+        {
+            if (isChild)
+            {
+                return ValidateAlias(portalAlias, true, false);
+            }
+
+            // validate the domain
+            Uri result;
+            if (Uri.TryCreate(Globals.AddHTTP(portalAlias), UriKind.Absolute, out result))
+            {
+                return ValidateAlias(result.Host, false, true) && ValidateAlias(portalAlias, false, false);
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        int IPortalAliasService.AddPortalAlias(IPortalAliasInfo portalAlias)
+        {
+            // Add Alias
+            var dataProvider = DataProvider.Instance();
+            int Id = dataProvider.AddPortalAlias(
+                portalAlias.PortalId,
+                portalAlias.HttpAlias.ToLowerInvariant().Trim('/'),
+                portalAlias.CultureCode,
+                portalAlias.Skin,
+                portalAlias.BrowserType.ToString(),
+                portalAlias.IsPrimary,
+                UserController.Instance.GetCurrentUserInfo().UserID);
+
+            // Log Event
+            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_CREATED);
+
+            // clear portal alias cache
+            ClearCache(true);
+
+            return Id;
+        }
+
+        /// <inheritdoc />
+        void IPortalAliasService.DeletePortalAlias(IPortalAliasInfo portalAlias)
+        {
+            // Delete Alias
+            DataProvider.Instance().DeletePortalAlias(portalAlias.PortalAliasId);
+
+            // Log Event
+            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_DELETED);
+
+            // clear portal alias cache
+            ClearCache(false, portalAlias.PortalId);
+        }
+
+        /// <inheritdoc />
+        IPortalAliasInfo IPortalAliasService.GetPortalAlias(string alias) =>
+            this.GetPortalAliasInternal(alias);
+
+        /// <inheritdoc />
+        IPortalAliasInfo IPortalAliasService.GetPortalAlias(string alias, int portalId) =>
+            this.GetPortalAliasesInternal()
+                .SingleOrDefault(portalAliasInfo => portalAliasInfo.Key.Equals(alias, StringComparison.InvariantCultureIgnoreCase) && portalAliasInfo.Value.PortalID == portalId).Value;
+
+        /// <inheritdoc />
+        IPortalAliasInfo IPortalAliasService.GetPortalAliasByPortalAliasId(int portalAliasId) =>
+            this.GetPortalAliasesInternal()
+                .SingleOrDefault(portalAliasInfo => portalAliasInfo.Value.PortalAliasId == portalAliasId).Value;
+
+        /// <inheritdoc />
+        IDictionary<string, IPortalAliasInfo> IPortalAliasService.GetPortalAliases()
+        {
+            var aliasCollection = new Dictionary<string, IPortalAliasInfo>();
+            foreach (var alias in this.GetPortalAliasesInternal().Values)
+            {
+                aliasCollection.Add(alias.HttpAlias, alias);
+            }
+
+            return aliasCollection;
+        }
+
+        /// <inheritdoc />
+        IEnumerable<IPortalAliasInfo> IPortalAliasService.GetPortalAliasesByPortalId(int portalId) =>
+            this.GetPortalAliasesInternal().Values.Where(alias => alias.PortalId == portalId).ToList();
+
+        /// <inheritdoc />
+        IPortalInfo IPortalAliasService.GetPortalByPortalAliasId(int portalAliasId) =>
+            CBO.FillObject<PortalInfo>(DataProvider.Instance().GetPortalByPortalAliasID(portalAliasId));
+
+        /// <inheritdoc />
+        void IPortalAliasService.UpdatePortalAlias(IPortalAliasInfo portalAlias)
+        {
+            // Update Alias
+            DataProvider.Instance().UpdatePortalAliasInfo(
+                portalAlias.PortalAliasId,
+                portalAlias.PortalId,
+                portalAlias.HttpAlias.ToLowerInvariant().Trim('/'),
+                portalAlias.CultureCode,
+                portalAlias.Skin,
+                portalAlias.BrowserType.ToString(),
+                portalAlias.IsPrimary,
+                UserController.Instance.GetCurrentUserInfo().UserID);
+
+            // Log Event
+            LogEvent(portalAlias, EventLogController.EventLogType.PORTALALIAS_UPDATED);
+
+            // clear portal alias cache
+            ClearCache(false);
+        }
+
+        internal Dictionary<string, PortalAliasInfo> GetPortalAliasesInternal()
+        {
+            return CBO.GetCachedObject<Dictionary<string, PortalAliasInfo>>(
+                new CacheItemArgs(
+                DataCache.PortalAliasCacheKey,
+                DataCache.PortalAliasCacheTimeOut,
+                DataCache.PortalAliasCachePriority),
+                c =>
+                {
+                    var dic = CBO.FillDictionary<string, PortalAliasInfo>(
+                        "HTTPAlias",
+                        DataProvider.Instance().GetPortalAliases());
+                    return dic.Keys.ToDictionary(key => key.ToLowerInvariant(), key => dic[key]);
+                },
+                true);
+        }
+
+        protected override Func<IPortalAliasController> GetFactory()
+        {
+            return () => new PortalAliasController();
+        }
+
+        private static void ClearCache(bool refreshServiceRoutes, int portalId = -1)
+        {
+            DataCache.RemoveCache(DataCache.PortalAliasCacheKey);
+            CacheController.FlushPageIndexFromCache();
+
+            if (portalId > Null.NullInteger)
+            {
+                DataCache.ClearTabsCache(portalId);
+            }
+
+            if (refreshServiceRoutes)
+            {
+                ServicesRoutingManager.ReRegisterServiceRoutesWhileSiteIsRunning();
+            }
+        }
+
+        private static void LogEvent(IPortalAliasInfo portalAlias, EventLogController.EventLogType logType)
+        {
+            int userId = UserController.Instance.GetCurrentUserInfo().UserID;
+            EventLogController.Instance.AddLog(portalAlias, PortalController.Instance.GetCurrentPortalSettings(), userId, string.Empty, logType);
+        }
+
+        private static bool ValidateAlias(string portalAlias, bool ischild, bool isDomain)
+        {
+            string validChars = "abcdefghijklmnopqrstuvwxyz0123456789-/";
+            if (!ischild)
+            {
+                validChars += ".:";
+            }
+
+            if (!isDomain)
+            {
+                validChars += "_";
+            }
+
+            return portalAlias.All(c => validChars.Contains(c.ToString()));
+        }
+
+        private IPortalAliasInfo GetPortalAliasLookupInternal(string alias)
+        {
+            return this.GetPortalAliasesInternal().SingleOrDefault(pa => pa.Key == alias).Value;
+        }
+
+        private IPortalAliasInfo GetPortalAliasInternal(string httpAlias)
+        {
+            string strPortalAlias;
+
+            // try the specified alias first
+            IPortalAliasInfo portalAlias = this.GetPortalAliasLookupInternal(httpAlias.ToLowerInvariant());
+
+            // domain.com and www.domain.com should be synonymous
+            if (portalAlias == null)
+            {
+                if (httpAlias.StartsWith("www.", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    // try alias without the "www." prefix
+                    strPortalAlias = httpAlias.Replace("www.", string.Empty);
+                }
+                else // try the alias with the "www." prefix
+                {
+                    strPortalAlias = string.Concat("www.", httpAlias);
+                }
+
+                // perform the lookup
+                portalAlias = this.GetPortalAliasLookupInternal(strPortalAlias.ToLowerInvariant());
+            }
+
+            // allow domain wildcards
+            if (portalAlias == null)
+            {
+                // remove the domain prefix ( ie. anything.domain.com = domain.com )
+                if (httpAlias.IndexOf(".", StringComparison.Ordinal) != -1)
+                {
+                    strPortalAlias = httpAlias.Substring(httpAlias.IndexOf(".", StringComparison.Ordinal) + 1);
+                }
+                else // be sure we have a clean string (without leftovers from preceding 'if' block)
+                {
+                    strPortalAlias = httpAlias;
+                }
+
+                // try an explicit lookup using the wildcard entry ( ie. *.domain.com )
+                portalAlias = this.GetPortalAliasLookupInternal("*." + strPortalAlias.ToLowerInvariant()) ??
+                              this.GetPortalAliasLookupInternal(strPortalAlias.ToLowerInvariant());
+
+                if (portalAlias == null)
+                {
+                    // try a lookup using "www." + raw domain
+                    portalAlias = this.GetPortalAliasLookupInternal("www." + strPortalAlias.ToLowerInvariant());
+                }
+            }
+
+            if (portalAlias == null)
+            {
+                // check if this is a fresh install ( no alias values in collection )
+                var controller = new PortalAliasController();
+                var portalAliases = controller.GetPortalAliasesInternal();
+                if (portalAliases.Keys.Count == 0 || (portalAliases.Count == 1 && portalAliases.ContainsKey("_default")))
+                {
+                    // relate the PortalAlias to the default portal on a fresh database installation
+                    DataProvider.Instance().UpdatePortalAlias(httpAlias.ToLowerInvariant().Trim('/'), UserController.Instance.GetCurrentUserInfo().UserID);
+                    EventLogController.Instance.AddLog(
+                        "PortalAlias",
+                        httpAlias,
+                        PortalController.Instance.GetCurrentPortalSettings(),
+                        UserController.Instance.GetCurrentUserInfo().UserID,
+                        EventLogController.EventLogType.PORTALALIAS_UPDATED);
+
+                    // clear the cachekey "GetPortalByAlias" otherwise portalalias "_default" stays in cache after first install
+                    DataCache.RemoveCache("GetPortalByAlias");
+
+                    // try again
+                    portalAlias = this.GetPortalAliasLookupInternal(httpAlias.ToLowerInvariant());
+                }
+            }
+
+            return portalAlias;
+        }
+    }
+}
diff --git a/DNN Platform/Library/Entities/Portals/PortalAliasInfo.cs b/DNN Platform/Library/Entities/Portals/PortalAliasInfo.cs
index 1071b4107b9..ac99cf619d7 100644
--- a/DNN Platform/Library/Entities/Portals/PortalAliasInfo.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalAliasInfo.cs	
@@ -1,148 +1,192 @@
-using DotNetNuke.Abstractions.Portals;
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-namespace DotNetNuke.Entities.Portals
-{
-    using System;
-    using System.Data;
-    using System.Xml;
-    using System.Xml.Schema;
-    using System.Xml.Serialization;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Modules;
+
+namespace DotNetNuke.Entities.Portals
+{
+    using System;
+    using System.Data;
+    using System.Xml;
+    using System.Xml.Schema;
+    using System.Xml.Serialization;
+
+    using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Modules;
     using DotNetNuke.Entities.Urls;
 
-    [Serializable]
-    public class PortalAliasInfo : BaseEntityInfo, IHydratable, IXmlSerializable, IPortalAliasInfo
-    {
-        public PortalAliasInfo()
-        {
-        }
-
-        public PortalAliasInfo(PortalAliasInfo alias)
-        {
-            this.HTTPAlias = alias.HTTPAlias;
-            this.PortalAliasID = alias.PortalAliasID;
-            this.PortalID = alias.PortalID;
-            this.IsPrimary = alias.IsPrimary;
-            this.Redirect = alias.Redirect;
-            this.BrowserType = alias.BrowserType;
-            this.CultureCode = alias.CultureCode;
-            this.Skin = alias.Skin;
-        }
-
-        public string HTTPAlias { get; set; }
-
-        public int PortalAliasID { get; set; }
-
-        public int PortalID { get; set; }
-
-        public bool IsPrimary { get; set; }
-
-        public bool Redirect { get; set; }
-
-        public BrowserTypes BrowserType { get; set; }
-
-        public string CultureCode { get; set; }
-
-        public string Skin { get; set; }
-
-        public int KeyID
-        {
-            get { return this.PortalAliasID; }
-            set { this.PortalAliasID = value; }
-        }
-
-        public void Fill(IDataReader dr)
-        {
-            this.FillInternal(dr);
-
-            this.PortalAliasID = Null.SetNullInteger(dr["PortalAliasID"]);
-            this.PortalID = Null.SetNullInteger(dr["PortalID"]);
-            this.HTTPAlias = Null.SetNullString(dr["HTTPAlias"]);
-            this.IsPrimary = Null.SetNullBoolean(dr["IsPrimary"]);
-            var browserType = Null.SetNullString(dr["BrowserType"]);
-            this.BrowserType = string.IsNullOrEmpty(browserType) || browserType.Equals("normal", StringComparison.OrdinalIgnoreCase)
-                              ? BrowserTypes.Normal
-                              : BrowserTypes.Mobile;
-            this.CultureCode = Null.SetNullString(dr["CultureCode"]);
-            this.Skin = Null.SetNullString(dr["Skin"]);
-        }
-
-        public XmlSchema GetSchema()
-        {
-            return null;
-        }
-
-        public void ReadXml(XmlReader reader)
-        {
-            while (reader.Read())
-            {
-                if (reader.NodeType == XmlNodeType.EndElement)
-                {
-                    break;
-                }
-
-                if (reader.NodeType == XmlNodeType.Whitespace)
-                {
-                    continue;
-                }
-
-                switch (reader.Name)
-                {
-                    case "portalAlias":
-                        break;
-                    case "portalID":
-                        this.PortalID = reader.ReadElementContentAsInt();
-                        break;
-                    case "portalAliasID":
-                        this.PortalAliasID = reader.ReadElementContentAsInt();
-                        break;
-                    case "HTTPAlias":
-                        this.HTTPAlias = reader.ReadElementContentAsString();
-                        break;
-                    case "skin":
-                        this.Skin = reader.ReadElementContentAsString();
-                        break;
-                    case "cultureCode":
-                        this.CultureCode = reader.ReadElementContentAsString();
-                        break;
-                    case "browserType":
-                        string type = reader.ReadElementContentAsString();
-                        this.BrowserType = type.Equals("mobile", StringComparison.InvariantCultureIgnoreCase) ? BrowserTypes.Mobile : BrowserTypes.Normal;
-                        break;
-                    case "primary":
-                        this.IsPrimary = reader.ReadElementContentAsBoolean();
-                        break;
-                    default:
-                        if (reader.NodeType == XmlNodeType.Element && !string.IsNullOrEmpty(reader.Name))
-                        {
-                            reader.ReadElementContentAsString();
-                        }
-
-                        break;
-                }
-            }
-        }
-
-        public void WriteXml(XmlWriter writer)
-        {
-            // Write start of main elemenst
-            writer.WriteStartElement("portalAlias");
-
-            // write out properties
-            writer.WriteElementString("portalID", this.PortalID.ToString());
-            writer.WriteElementString("portalAliasID", this.PortalAliasID.ToString());
-            writer.WriteElementString("HTTPAlias", this.HTTPAlias);
-            writer.WriteElementString("skin", this.Skin);
-            writer.WriteElementString("cultureCode", this.CultureCode);
-            writer.WriteElementString("browserType", this.BrowserType.ToString().ToLowerInvariant());
-            writer.WriteElementString("primary", this.IsPrimary.ToString().ToLowerInvariant());
-
-            // Write end of main element
-            writer.WriteEndElement();
-        }
-    }
-}
+    using NewBrowserType = DotNetNuke.Abstractions.Urls.BrowserTypes;
+
+    /// <inheritdoc />
+    [Serializable]
+    public class PortalAliasInfo : BaseEntityInfo, IHydratable, IXmlSerializable, IPortalAliasInfo
+    {
+        public PortalAliasInfo()
+        {
+        }
+
+        public PortalAliasInfo(PortalAliasInfo alias)
+        {
+            this.HttpAlias = alias.HttpAlias;
+            this.PortalAliasId = alias.PortalAliasId;
+            this.PortalId = alias.PortalId;
+            this.IsPrimary = alias.IsPrimary;
+            this.Redirect = alias.Redirect;
+            ((IPortalAliasInfo)this).BrowserType = ((IPortalAliasInfo)alias).BrowserType;
+            this.CultureCode = alias.CultureCode;
+            this.Skin = alias.Skin;
+        }
+
+        /// <inheritdoc />
+        public string HttpAlias { get; set; }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasInfo.HttpAlias instead.")]
+        public string HTTPAlias
+        {
+            get => this.HttpAlias;
+            set => this.HttpAlias = value;
+        }
+
+        /// <inheritdoc />
+        public int PortalAliasId { get; set; }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasInfo.PortalAliasId instead.")]
+        public int PortalAliasID
+        {
+            get => this.PortalAliasId;
+            set => this.PortalAliasId = value;
+        }
+
+        /// <inheritdoc />
+        public int PortalId { get; set; }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasInfo.PortalId instead.")]
+        public int PortalID
+        {
+            get => this.PortalId;
+            set => this.PortalId = value;
+        }
+
+        /// <inheritdoc />
+        public bool IsPrimary { get; set; }
+
+        /// <inheritdoc />
+        public bool Redirect { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Browser Type.
+        /// </summary>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasInfo.BrowserType instead.")]
+        public BrowserTypes BrowserType
+        {
+            get => (BrowserTypes)((IPortalAliasInfo)this).BrowserType;
+            set => ((IPortalAliasInfo)this).BrowserType = (NewBrowserType)value;
+        }
+
+        /// <inheritdoc />
+        NewBrowserType IPortalAliasInfo.BrowserType { get; set; }
+
+        /// <inheritdoc />
+        public string CultureCode { get; set; }
+
+        /// <inheritdoc />
+        public string Skin { get; set; }
+
+        /// <inheritdoc />
+        public int KeyID
+        {
+            get { return this.PortalAliasId; }
+            set { this.PortalAliasId = value; }
+        }
+
+        public void Fill(IDataReader dr)
+        {
+            this.FillInternal(dr);
+
+            this.PortalAliasId = Null.SetNullInteger(dr["PortalAliasID"]);
+            this.PortalId = Null.SetNullInteger(dr["PortalID"]);
+            this.HttpAlias = Null.SetNullString(dr["HTTPAlias"]);
+            this.IsPrimary = Null.SetNullBoolean(dr["IsPrimary"]);
+            var browserType = Null.SetNullString(dr["BrowserType"]);
+            this.BrowserType = string.IsNullOrEmpty(browserType) || browserType.Equals("normal", StringComparison.OrdinalIgnoreCase)
+                              ? BrowserTypes.Normal
+                              : BrowserTypes.Mobile;
+            this.CultureCode = Null.SetNullString(dr["CultureCode"]);
+            this.Skin = Null.SetNullString(dr["Skin"]);
+        }
+
+        public XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        public void ReadXml(XmlReader reader)
+        {
+            while (reader.Read())
+            {
+                if (reader.NodeType == XmlNodeType.EndElement)
+                {
+                    break;
+                }
+
+                if (reader.NodeType == XmlNodeType.Whitespace)
+                {
+                    continue;
+                }
+
+                switch (reader.Name)
+                {
+                    case "portalAlias":
+                        break;
+                    case "portalID":
+                        this.PortalId = reader.ReadElementContentAsInt();
+                        break;
+                    case "portalAliasID":
+                        this.PortalAliasId = reader.ReadElementContentAsInt();
+                        break;
+                    case "HTTPAlias":
+                        this.HttpAlias = reader.ReadElementContentAsString();
+                        break;
+                    case "skin":
+                        this.Skin = reader.ReadElementContentAsString();
+                        break;
+                    case "cultureCode":
+                        this.CultureCode = reader.ReadElementContentAsString();
+                        break;
+                    case "browserType":
+                        string type = reader.ReadElementContentAsString();
+                        this.BrowserType = type.Equals("mobile", StringComparison.InvariantCultureIgnoreCase) ? BrowserTypes.Mobile : BrowserTypes.Normal;
+                        break;
+                    case "primary":
+                        this.IsPrimary = reader.ReadElementContentAsBoolean();
+                        break;
+                    default:
+                        if (reader.NodeType == XmlNodeType.Element && !string.IsNullOrEmpty(reader.Name))
+                        {
+                            reader.ReadElementContentAsString();
+                        }
+
+                        break;
+                }
+            }
+        }
+
+        public void WriteXml(XmlWriter writer)
+        {
+            // Write start of main elemenst
+            writer.WriteStartElement("portalAlias");
+
+            // write out properties
+            writer.WriteElementString("portalID", this.PortalId.ToString());
+            writer.WriteElementString("portalAliasID", this.PortalAliasId.ToString());
+            writer.WriteElementString("HTTPAlias", this.HttpAlias);
+            writer.WriteElementString("skin", this.Skin);
+            writer.WriteElementString("cultureCode", this.CultureCode);
+            writer.WriteElementString("browserType", this.BrowserType.ToString().ToLowerInvariant());
+            writer.WriteElementString("primary", this.IsPrimary.ToString().ToLowerInvariant());
+
+            // Write end of main element
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/DNN Platform/Library/Entities/Portals/PortalInfo.cs b/DNN Platform/Library/Entities/Portals/PortalInfo.cs
index f9f1af923c0..1868f715370 100644
--- a/DNN Platform/Library/Entities/Portals/PortalInfo.cs	
+++ b/DNN Platform/Library/Entities/Portals/PortalInfo.cs	
@@ -1,880 +1,537 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-namespace DotNetNuke.Entities.Portals
-{
-    using System;
-    using System.Data;
-    using System.Security.Cryptography;
-    using System.Xml.Serialization;
-
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Entities.Users;
+
+namespace DotNetNuke.Entities.Portals
+{
+    using System;
+    using System.Data;
+    using System.Security.Cryptography;
+    using System.Xml.Serialization;
+
+    using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Modules;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Entities.Users;
     using DotNetNuke.Security.Roles;
 
-    /// <summary>
-    /// PortalInfo provides a base class for Portal information
-    /// This class inherites from the <c>BaseEntityInfo</c> and is <c>Hydratable</c>.
-    /// </summary>
-    /// <remarks><seealso cref="IHydratable"/>
-    /// <example>This example shows how the <c>PortalInfo</c> class is used to get physical file names
-    ///  <code lang="vbnet">
-    /// Public ReadOnly Property PhysicalPath() As String
-    ///        Get
-    ///            Dim _PhysicalPath As String
-    ///            Dim PortalSettings As PortalSettings = Nothing
-    ///            If Not HttpContext.Current Is Nothing Then
-    ///                PortalSettings = PortalController.Instance.GetCurrentPortalSettings()
-    ///            End If
-    ///            If PortalId = Null.NullInteger Then
-    ///                _PhysicalPath = DotNetNuke.Common.Globals.HostMapPath + RelativePath
-    ///            Else
-    ///                If PortalSettings Is Nothing OrElse PortalSettings.PortalId &lt;&gt; PortalId Then
-    ///                    ' Get the PortalInfo  based on the Portalid
-    ///                    Dim objPortals As New PortalController()
-    ///                    Dim objPortal As PortalInfo = objPortals.GetPortal(PortalId)
-    ///                    _PhysicalPath = objPortal.HomeDirectoryMapPath + RelativePath
-    ///                Else
-    ///                    _PhysicalPath = PortalSettings.HomeDirectoryMapPath + RelativePath
-    ///                End If
-    ///            End If
-    ///            Return _PhysicalPath.Replace("/", "\")
-    ///        End Get
-    /// End Property
-    /// </code>
-    /// </example>
-    /// </remarks>
-    [XmlRoot("settings", IsNullable = false)]
-    [Serializable]
-    public class PortalInfo : BaseEntityInfo, IHydratable
-    {
-        private string _administratorRoleName;
-        private int _pages = Null.NullInteger;
-        private string _registeredRoleName;
-
-        private int _users;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PortalInfo"/> class.
-        /// Create new Portalinfo instance.
-        /// </summary>
-        /// <remarks>
-        /// <example>This example illustrates the creation of a new <c>PortalInfo</c> object
-        /// <code lang="vbnet">
-        /// For Each portal As PortalInfo In New PortalController().GetPortals
-        ///     Dim portalID As Integer = portal.PortalID
-        ///     ...
-        /// Next
-        /// </code>
-        /// </example>
-        /// </remarks>
-        public PortalInfo()
-        {
-            this.Users = Null.NullInteger;
-        }
-
-        /// <summary>
-        /// Gets or sets the footer text as specified in the Portal settings.
-        /// </summary>
-        /// <value>Footer text of the portal.</value>
-        /// <returns>Returns the the footer text of the portal.</returns>
-        /// <remarks>
-        /// <example>This show the usage of the <c>FooterText</c> property
-        /// <code lang="vbnet">
-        /// txtFooterText.Text = objPortal.FooterText
-        /// </code>
-        /// </example>
-        /// </remarks>
-        [XmlElement("footertext")]
-        public string FooterText { get; set; }
-
-        /// <summary>
-        /// Gets or sets home directory of the portal (logical path).
-        /// </summary>
-        /// <value>Portal home directory.</value>
-        /// <returns>Portal home directory.</returns>
-        /// <remarks><seealso cref="HomeDirectoryMapPath"></seealso></remarks>
-        [XmlElement("homedirectory")]
-        public string HomeDirectory { get; set; }
-
-        /// <summary>
-        /// Gets home System (local) directory of the portal (logical path).
-        /// </summary>
-        /// <value>Portal home system directory.</value>
-        /// <returns>Portal home system directory in local filesystem.</returns>
-        /// <remarks><seealso cref="HomeSystemDirectoryMapPath"></seealso></remarks>
-        [XmlElement("homesystemdirectory")]
-        public string HomeSystemDirectory
-        {
-            get { return string.Format("{0}-System", this.HomeDirectory); }
-        }
-
-        /// <summary>
-        /// Gets fysical path on disk of the home directory of the portal.
-        /// </summary>
-        /// <value>
-        /// <placeholder>Fysical path on disk of the home directory of the portal</placeholder>
-        /// </value>
-        /// <returns>Fully qualified path of the home directory.</returns>
-        /// <remarks><seealso cref="HomeDirectory"></seealso></remarks>
-        [XmlIgnore]
-        public string HomeDirectoryMapPath
-        {
-            get
-            {
-                return string.Format("{0}\\{1}\\", Globals.ApplicationMapPath, this.HomeDirectory.Replace("/", "\\"));
-            }
-        }
-
-        /// <summary>
-        /// Gets fysical path on disk of the home directory of the portal.
-        /// </summary>
-        /// <value>
-        /// <placeholder>Fysical path on disk of the home directory of the portal</placeholder>
-        /// </value>
-        /// <returns>Fully qualified path of the home system (local) directory.</returns>
-        /// <remarks><seealso cref="HomeDirectory"></seealso></remarks>
-        [XmlIgnore]
-        public string HomeSystemDirectoryMapPath
-        {
-            get
-            {
-                return string.Format("{0}\\{1}\\", Globals.ApplicationMapPath, this.HomeSystemDirectory.Replace("/", "\\"));
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets userID of the user who is the admininistrator of the portal.
-        /// </summary>
-        /// <value>UserId of the user who is the portal admin.</value>
-        /// <returns>UserId of the user who is the portal admin.</returns>
-        /// <remarks><example>This show the usage of the <c>AdministratorId</c>
-        /// <code lang="vbnet">
-        /// Dim Arr As ArrayList = objRoleController.GetUserRolesByRoleName(intPortalId, objPortal.AdministratorRoleName)
-        /// Dim i As Integer
-        ///       For i = 0 To Arr.Count - 1
-        ///             Dim objUser As UserRoleInfo = CType(Arr(i), UserRoleInfo)
-        ///             cboAdministratorId.Items.Add(New ListItem(objUser.FullName, objUser.UserID.ToString))
-        ///      Next
-        ///      If Not cboAdministratorId.Items.FindByValue(objPortal.AdministratorId.ToString) Is Nothing Then
-        ///          cboAdministratorId.Items.FindByValue(objPortal.AdministratorId.ToString).Selected = True
-        ///      End If
-        /// </code></example></remarks>
-        [XmlElement("administratorid")]
-        public int AdministratorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the RoleId of the Security Role of the Administrators group of the portal.
-        /// </summary>
-        /// <value>RoleId of de Administrators Security Role.</value>
-        /// <returns>RoleId of de Administrators Security Role.</returns>
-        /// <remarks><example>This shows the usage of the AdministratoprRoleId
-        /// <code lang="vbnet">
-        /// Dim objPortal As PortalInfo = New PortalController().GetPortal(PortalID)
-        ///     If RoleID = objPortal.AdministratorRoleId Then
-        ///         _RoleType = Roles.RoleType.Administrator
-        ///     ElseIf RoleID = objPortal.RegisteredRoleId Then
-        ///         _RoleType = Roles.RoleType.RegisteredUser
-        ///     ElseIf RoleName = "Subscribers" Then
-        ///         _RoleType = Roles.RoleType.Subscriber
-        ///     End If
-        /// </code>
-        /// </example>
-        /// </remarks>
-        [XmlElement("administratorroleid")]
-        public int AdministratorRoleId { get; set; }
-
-        /// <summary>
-        /// Gets or sets tabId at which admin tasks start.
-        /// </summary>
-        /// <value>TabID of admin tasks.</value>
-        /// <returns>TabID of admin tasks.</returns>
-        /// <remarks></remarks>
-        [XmlElement("admintabid")]
-        public int AdminTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets image (bitmap) file that is used as background for the portal.
-        /// </summary>
-        /// <value>Name of the file that is used as background.</value>
-        /// <returns>Name of the file that is used as background.</returns>
-        /// <remarks></remarks>
-        [XmlElement("backgroundfile")]
-        public string BackgroundFile { get; set; }
-
-        /// <summary>
-        /// Gets or sets current host version.
-        /// </summary>
-        [XmlElement("crmversion")]
-        public string CrmVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets setting for the type of banner advertising in the portal.
-        /// </summary>
-        /// <value>Type of banner advertising.</value>
-        /// <returns>Type of banner advertising.</returns>
-        /// <remarks><example>This show the usage of BannerAdvertising setting
-        /// <code lang="vbnet">
-        /// optBanners.SelectedIndex = objPortal.BannerAdvertising
-        /// </code></example></remarks>
-        [XmlElement("banneradvertising")]
-        public int BannerAdvertising { get; set; }
-
-        [XmlElement("cultureCode")]
-        public string CultureCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets curreny format that is used in the portal.
-        /// </summary>
-        /// <value>Currency of the portal.</value>
-        /// <returns>Currency of the portal.</returns>
-        /// <remarks><example>This exampels show the usage of the Currentcy property
-        /// <code lang="vbnet">
-        /// cboCurrency.DataSource = colList
-        /// cboCurrency.DataBind()
-        /// If Null.IsNull(objPortal.Currency) Or cboCurrency.Items.FindByValue(objPortal.Currency) Is Nothing Then
-        ///     cboCurrency.Items.FindByValue("USD").Selected = True
-        /// Else
-        ///     cboCurrency.Items.FindByValue(objPortal.Currency).Selected = True
-        /// End If
-        /// </code></example></remarks>
-        [XmlElement("currency")]
-        public string Currency { get; set; }
-
-        /// <summary>
-        /// Gets or sets default language for the portal.
-        /// </summary>
-        /// <value>Default language of the portal.</value>
-        /// <returns>Default language of the portal.</returns>
-        /// <remarks></remarks>
-        [XmlElement("defaultlanguage")]
-        public string DefaultLanguage { get; set; }
-
-        /// <summary>
-        /// Gets or sets description of the portal.
-        /// </summary>
-        /// <value>Description of the portal.</value>
-        /// <returns>Description of the portal.</returns>
-        /// <remarks><example>This show the usage of the <c>Description</c> property
-        /// <code lang="vbnet">
-        /// Dim objPortalController As New PortalController
-        /// Dim objPortal As PortalInfo = objPortalController.GetPortal(PortalID)
-        ///      txtPortalName.Text = objPortal.PortalName
-        ///      txtDescription.Text = objPortal.Description
-        ///      txtKeyWords.Text = objPortal.KeyWords
-        ///  </code></example></remarks>
-        [XmlElement("description")]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default e-mail to be used in the porta.
-        /// </summary>
-        /// <value>E-mail of the portal.</value>
-        /// <returns>E-mail of the portal.</returns>
-        /// <remarks></remarks>
-        [XmlElement("email")]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Gets or sets date at which the portal expires.
-        /// </summary>
-        /// <value>Date of expiration of the portal.</value>
-        /// <returns>Date of expiration of the portal.</returns>
-        /// <remarks><example>This show the Portal expiration date usage
-        /// <code lang="vbnet">
-        /// If Not Null.IsNull(objPortal.ExpiryDate) Then
-        ///     txtExpiryDate.Text = objPortal.ExpiryDate.ToShortDateString
-        /// End If
-        /// txtHostFee.Text = objPortal.HostFee.ToString
-        /// txtHostSpace.Text = objPortal.HostSpace.ToString
-        /// txtPageQuota.Text = objPortal.PageQuota.ToString
-        /// txtUserQuota.Text = objPortal.UserQuota.ToString
-        /// </code></example></remarks>
-        [XmlElement("expirydate")]
-        public DateTime ExpiryDate { get; set; }
-
-
-        /// <summary>
-        /// Gets or sets gUID of the portal info object.
-        /// </summary>
-        /// <value>Portal info Object GUID.</value>
-        /// <returns>GUD of the portal info object.</returns>
-        /// <remarks></remarks>
-        [XmlIgnore]
-        public Guid GUID { get; set; }
-
-
-        /// <summary>
-        /// Gets or sets tabdId of the Home page.
-        /// </summary>
-        /// <value>TabId of the Home page.</value>
-        /// <returns>TabId of the Home page.</returns>
-        /// <remarks></remarks>
-        [XmlElement("hometabid")]
-        public int HomeTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets amount of currency that is used as a hosting fee of the portal.
-        /// </summary>
-        /// <value>Currency amount hosting fee.</value>
-        /// <returns>Currency amount hosting fee.</returns>
-        /// <remarks><example>This show the Portal <c>HostFee</c>usage
-        /// <code lang="vbnet">
-        /// If Not Null.IsNull(objPortal.ExpiryDate) Then
-        ///     txtExpiryDate.Text = objPortal.ExpiryDate.ToShortDateString
-        /// End If
-        /// txtHostFee.Text = objPortal.HostFee.ToString
-        /// txtHostSpace.Text = objPortal.HostSpace.ToString
-        /// txtPageQuota.Text = objPortal.PageQuota.ToString
-        /// txtUserQuota.Text = objPortal.UserQuota.ToString
-        /// </code></example></remarks>
-        [XmlElement("hostfee")]
-        public float HostFee { get; set; }
-
-        /// <summary>
-        /// Gets or sets total disk space allowed for the portal (Mb). 0 means not limited.
-        /// </summary>
-        /// <value>Diskspace allowed for the portal.</value>
-        /// <returns>Diskspace allowed for the portal.</returns>
-        /// <remarks><example>This show the Portal <c>HostSpace</c>usage
-        /// <code lang="vbnet">
-        /// If Not Null.IsNull(objPortal.ExpiryDate) Then
-        ///     txtExpiryDate.Text = objPortal.ExpiryDate.ToShortDateString
-        /// End If
-        /// txtHostFee.Text = objPortal.HostFee.ToString
-        /// txtHostSpace.Text = objPortal.HostSpace.ToString
-        /// txtPageQuota.Text = objPortal.PageQuota.ToString
-        /// txtUserQuota.Text = objPortal.UserQuota.ToString
-        /// </code></example></remarks>
-        [XmlElement("hostspace")]
-        public int HostSpace { get; set; }
-
-        /// <summary>
-        /// Gets or sets keywords (separated by ,) for this portal.
-        /// </summary>
-        /// <value>Keywords seperated by .</value>
-        /// <returns>Keywords for this portal.</returns>
-        /// <remarks><example>This show the usage of the <c>KeyWords</c> property
-        /// <code lang="vbnet">
-        /// Dim objPortalController As New PortalController
-        /// Dim objPortal As PortalInfo = objPortalController.GetPortal(PortalID)
-        ///      txtPortalName.Text = objPortal.PortalName
-        ///      txtDescription.Text = objPortal.Description
-        ///      txtKeyWords.Text = objPortal.KeyWords
-        ///  </code></example></remarks>
-        [XmlElement("keywords")]
-        public string KeyWords { get; set; }
-
-        /// <summary>
-        /// Gets or sets tabId with the login control, page to login.
-        /// </summary>
-        /// <value>TabId of the Login page.</value>
-        /// <returns>TabId of the Login page.</returns>
-        /// <remarks></remarks>
-        [XmlElement("logintabid")]
-        public int LoginTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the portal has a logo (bitmap) associated with the portal. Teh admin can set the logo in the portal settings.
-        /// </summary>
-        /// <value>URL of the logo.</value>
-        /// <returns>URL of the Portal logo.</returns>
-        /// <remarks><example><code lang="vbnet">
-        ///  urlLogo.Url = objPortal.LogoFile
-        ///  urlLogo.FileFilter = glbImageFileTypes
-        /// </code></example></remarks>
-        [XmlElement("logofile")]
-        public string LogoFile { get; set; }
-
-        /// <summary>
-        /// Gets or sets number of portal pages allowed in the portal. 0 means not limited.
-        /// </summary>
-        /// <value>Number of portal pages allowed.</value>
-        /// <returns>Number of portal pages allowed.</returns>
-        /// <remarks><example>This show the Portal <c>PageQuota</c>usage
-        /// <code lang="vbnet">
-        /// If Not Null.IsNull(objPortal.ExpiryDate) Then
-        ///     txtExpiryDate.Text = objPortal.ExpiryDate.ToShortDateString
-        /// End If
-        /// txtHostFee.Text = objPortal.HostFee.ToString
-        /// txtHostSpace.Text = objPortal.HostSpace.ToString
-        /// txtPageQuota.Text = objPortal.PageQuota.ToString
-        /// txtUserQuota.Text = objPortal.UserQuota.ToString
-        /// </code></example></remarks>
-        [XmlElement("pagequota")]
-        public int PageQuota { get; set; }
-
-        /// <summary>
-        /// Gets or sets name of the Payment processor that is used for portal payments, e.g. PayPal.
-        /// </summary>
-        /// <value>Name of the portal payment processor.</value>
-        /// <returns>Name of the portal payment processor.</returns>
-        /// <remarks></remarks>
-        [XmlElement("paymentprocessor")]
-        public string PaymentProcessor { get; set; }
-
-        /// <summary>
-        /// Gets or sets unique idenitifier of the Portal within the site.
-        /// </summary>
-        /// <value>Portal identifier.</value>
-        /// <returns>Portal Identifier.</returns>
-        /// <remarks></remarks>
-        [XmlElement("portalid")]
-        public int PortalID { get; set; }
-
-        /// <summary>
-        /// Gets or sets contains the id of the portal group that the portal belongs to
-        /// Will be null or -1 (null.nullinteger) if the portal does not belong to a portal group.
-        /// </summary>
-        /// <value>Portal Group identifier.</value>
-        /// <returns>Portal Group Identifier.</returns>
-        /// <remarks></remarks>
-        public int PortalGroupID { get; set; }
-
-        /// <summary>
-        /// Gets or sets name of the portal. Can be set at creation time, Admin can change the name in the portal settings.
-        /// </summary>
-        /// <value>Name of the portal.</value>
-        /// <returns>Name of the portal.</returns>
-        /// <remarks><example>This show the usage of the <c>PortalName</c> property
-        /// <code lang="vbnet">
-        /// Dim objPortalController As New PortalController
-        /// Dim objPortal As PortalInfo = objPortalController.GetPortal(PortalID)
-        ///      txtPortalName.Text = objPortal.PortalName
-        ///      txtDescription.Text = objPortal.Description
-        ///      txtKeyWords.Text = objPortal.KeyWords
-        ///  </code></example></remarks>
-        [XmlElement("portalname")]
-        public string PortalName { get; set; }
-
-        /// <summary>
-        /// Gets or sets password to use in the payment processor.
-        /// </summary>
-        /// <value>Payment Processor password.</value>
-        /// <returns></returns>
-        /// <remarks><example>This shows the usage of the payment processing
-        /// <code lang="vbnet">
-        /// If objPortal.PaymentProcessor &lt;&gt; "" Then
-        ///     If Not cboProcessor.Items.FindByText(objPortal.PaymentProcessor) Is Nothing Then
-        ///         cboProcessor.Items.FindByText(objPortal.PaymentProcessor).Selected = True
-        ///     Else       ' default
-        ///          If Not cboProcessor.Items.FindByText("PayPal") Is Nothing Then
-        ///                cboProcessor.Items.FindByText("PayPal").Selected = True
-        ///           End If
-        ///      End If
-        ///      Else
-        ///      cboProcessor.Items.FindByValue("").Selected = True
-        /// End If
-        /// txtUserId.Text = objPortal.ProcessorUserId
-        /// txtPassword.Attributes.Add("value", objPortal.ProcessorPassword)
-        /// </code></example></remarks>
-        [XmlElement("processorpassword")]
-        public string ProcessorPassword { get; set; }
-
-        /// <summary>
-        /// Gets or sets payment Processor userId.
-        /// </summary>
-        /// <value>
-        /// <placeholder>Payment Processor userId</placeholder>
-        /// </value>
-        /// <returns></returns>
-        /// <remarks> <seealso cref="PaymentProcessor"></seealso>
-        /// <example>This shows the usage of the payment processing
-        /// <code lang="vbnet">
-        /// If objPortal.PaymentProcessor &lt;&gt; "" Then
-        ///     If Not cboProcessor.Items.FindByText(objPortal.PaymentProcessor) Is Nothing Then
-        ///         cboProcessor.Items.FindByText(objPortal.PaymentProcessor).Selected = True
-        ///     Else       ' default
-        ///          If Not cboProcessor.Items.FindByText("PayPal") Is Nothing Then
-        ///                cboProcessor.Items.FindByText("PayPal").Selected = True
-        ///           End If
-        ///      End If
-        ///      Else
-        ///      cboProcessor.Items.FindByValue("").Selected = True
-        /// End If
-        /// txtUserId.Text = objPortal.ProcessorUserId
-        /// txtPassword.Attributes.Add("value", objPortal.ProcessorPassword)
-        /// </code></example></remarks>
-        [XmlElement("processoruserid")]
-        public string ProcessorUserId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the RoleId of the Registered users group of the portal.
-        /// </summary>
-        /// <value>RoleId of the Registered users. </value>
-        /// <returns>RoleId of the Registered users. </returns>
-        /// <remarks></remarks>
-        [XmlElement("registeredroleid")]
-        public int RegisteredRoleId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Registration page.
-        /// </summary>
-        /// <value>TabId of the Registration page.</value>
-        /// <returns>TabId of the Registration page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("registertabid")]
-        public int RegisterTabId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Search profile page.
-        /// </summary>
-        /// <value>TabdId of the Search Results page.</value>
-        /// <returns>TabdId of the Search Results page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("searchtabid")]
-        public int SearchTabId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Custom 404 page.
-        /// </summary>
-        /// <value>Tabid of the Custom 404 page.</value>
-        /// <returns>Tabid of the Custom 404 page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("custom404tabid")]
-        public int Custom404TabId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Custom 500 error page.
-        /// </summary>
-        /// <value>Tabid of the Custom 500 error page.</value>
-        /// <returns>Tabid of the Custom 500 error page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("custom500tabid")]
-        public int Custom500TabId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Terms of Use page.
-        /// </summary>
-        /// <value>Tabid of the Terms of Use page.</value>
-        /// <returns>Tabid of the Terms of Use page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("termstabid")]
-        public int TermsTabId { get; set; }
-
-        /// <summary>
-        ///   Gets or sets tabid of the Privacy Statement page.
-        /// </summary>
-        /// <value>Tabid of the Privacy Statement page.</value>
-        /// <returns>Tabid of the Privacy Statement page.</returns>
-        /// <remarks>
-        /// </remarks>
-        [XmlElement("privacytabid")]
-        public int PrivacyTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets # of days that Site log history should be kept. 0 means unlimited.
-        /// </summary>
-        /// <value># of days sitelog history.</value>
-        /// <returns># of days sitelog history.</returns>
-        [XmlElement("siteloghistory")]
-        [Obsolete("Deprecated in 8.0.0. Scheduled removal in v11.0.0.")]
-        public int SiteLogHistory { get; set; }
-
-        /// <summary>
-        /// Gets or sets tabdId of the splash page. If 0, there is no splash page.
-        /// </summary>
-        /// <value>TabdId of the Splash page.</value>
-        /// <returns>TabdId of the Splash page.</returns>
-        /// <remarks></remarks>
-        [XmlElement("splashtabid")]
-        public int SplashTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets tabId at which Host tasks start.
-        /// </summary>
-        /// <value>TabId of Host tasks.</value>
-        /// <returns>TabId of Host tasks.</returns>
-        /// <remarks></remarks>
-        [XmlElement("supertabid")]
-        public int SuperTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets number of registered users allowed in the portal. 0 means not limited.
-        /// </summary>
-        /// <value>Number of registered users allowed. </value>
-        /// <returns>Number of registered users allowed. </returns>
-        /// <remarks><example>This show the Portal userQuota usage
-        /// <code lang="vbnet">
-        /// If Not Null.IsNull(objPortal.ExpiryDate) Then
-        ///     txtExpiryDate.Text = objPortal.ExpiryDate.ToShortDateString
-        /// End If
-        /// txtHostFee.Text = objPortal.HostFee.ToString
-        /// txtHostSpace.Text = objPortal.HostSpace.ToString
-        /// txtPageQuota.Text = objPortal.PageQuota.ToString
-        /// txtUserQuota.Text = objPortal.UserQuota.ToString
-        /// </code></example></remarks>
-        [XmlElement("userquota")]
-        public int UserQuota { get; set; }
-
-        /// <summary>
-        /// Gets or sets type of registration that the portal supports.
-        /// </summary>
-        /// <value>Type of registration.</value>
-        /// <returns>Type of registration.</returns>
-        /// <remarks><example>Registration type
-        /// <code lang="vbnet">
-        /// optUserRegistration.SelectedIndex = objPortal.UserRegistration
-        /// </code></example></remarks>
-        [XmlElement("userregistration")]
-        public int UserRegistration { get; set; }
-
-        /// <summary>
-        /// Gets or sets tabid of the User profile page.
-        /// </summary>
-        /// <value>TabdId of the User profile page.</value>
-        /// <returns>TabdId of the User profile page.</returns>
-        /// <remarks></remarks>
-        [XmlElement("usertabid")]
-        public int UserTabId { get; set; }
-
-        /// <summary>
-        /// Gets or sets actual number of actual users for this portal.
-        /// </summary>
-        /// <value>Number of users for the portal.</value>
-        /// <returns>Number of users for the portal.</returns>
-        /// <remarks></remarks>
-        [XmlElement("users")]
-        public int Users
-        {
-            get
-            {
-                if (this._users < 0)
-                {
-                    this._users = UserController.GetUserCountByPortal(this.PortalID);
-                }
-
-                return this._users;
-            }
-
-            set { this._users = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets dNN Version # of the portal installation.
-        /// </summary>
-        /// <value>Version # of the portal installation.</value>
-        /// <returns>Version # of the portal installation.</returns>
-        /// <remarks></remarks>
-        [XmlElement("version")]
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the actual name of the Administrators group of the portal.
-        /// This name is retrieved from the RoleController object.
-        /// </summary>
-        /// <value>The name of the Administrators group.</value>
-        /// <returns>The name of the Administrators group.</returns>
-        /// <remarks></remarks>
-        [XmlElement("administratorrolename")]
-        public string AdministratorRoleName
-        {
-            get
-            {
-                if (this._administratorRoleName == Null.NullString && this.AdministratorRoleId > Null.NullInteger)
-                {
-                    // Get Role Name
-                    RoleInfo adminRole = RoleController.Instance.GetRole(this.PortalID, r => r.RoleID == this.AdministratorRoleId);
-                    if (adminRole != null)
-                    {
-                        this._administratorRoleName = adminRole.RoleName;
-                    }
-                }
-
-                return this._administratorRoleName;
-            }
-
-            set
-            {
-                this._administratorRoleName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets actual number of pages of the portal.
-        /// </summary>
-        /// <value>Number of pages of the portal.</value>
-        /// <returns>Number of pages of the portal.</returns>
-        /// <remarks></remarks>
-        [XmlElement("pages")]
-        public int Pages
-        {
-            get
-            {
-                if (this._pages < 0)
-                {
-                    this._pages = TabController.Instance.GetUserTabsByPortal(this.PortalID).Count;
-                }
-
-                return this._pages;
-            }
-
-            set
-            {
-                this._pages = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the actual name of the Registerd Users group of the portal.
-        /// This name is retrieved from the RoleController object.
-        /// </summary>
-        /// <value>The name of the Registerd Users group.</value>
-        /// <returns>The name of the Registerd Users group.</returns>
-        /// <remarks></remarks>
-        [XmlElement("registeredrolename")]
-        public string RegisteredRoleName
-        {
-            get
-            {
-                if (this._registeredRoleName == Null.NullString && this.RegisteredRoleId > Null.NullInteger)
-                {
-                    // Get Role Name
-                    RoleInfo regUsersRole = RoleController.Instance.GetRole(this.PortalID, r => r.RoleID == this.RegisteredRoleId);
-                    if (regUsersRole != null)
-                    {
-                        this._registeredRoleName = regUsersRole.RoleName;
-                    }
-                }
-
-                return this._registeredRoleName;
-            }
-
-            set
-            {
-                this._registeredRoleName = value;
-            }
-        }
-
-        [XmlIgnore]
-        [Obsolete("Deprecated in DNN 6.0. Scheduled removal in v10.0.0.")]
-        public int TimeZoneOffset { get; set; }
-
-        /// <summary>
-        /// Gets or sets and sets the Key ID.
-        /// </summary>
-        /// <returns>KeyId of the IHydratable.Key.</returns>
-        /// <remarks><seealso cref="Fill"></seealso></remarks>
-        public int KeyID
-        {
-            get
-            {
-                return this.PortalID;
-            }
-
-            set
-            {
-                this.PortalID = value;
-            }
-        }
-
-        /// <summary>
-        /// Fills a PortalInfo from a Data Reader.
-        /// </summary>
-        /// <param name="dr">The Data Reader to use.</param>
-        /// <remarks>Standard IHydratable.Fill implementation.
-        /// <seealso cref="KeyID"></seealso></remarks>
-        public void Fill(IDataReader dr)
-        {
-            this.PortalID = Null.SetNullInteger(dr["PortalID"]);
-
-            try
-            {
-                this.PortalGroupID = Null.SetNullInteger(dr["PortalGroupID"]);
-            }
-            catch (IndexOutOfRangeException)
-            {
-                if (Globals.Status == Globals.UpgradeStatus.None)
-                {
-                    // this should not happen outside of an upgrade situation
-                    throw;
-                }
-
-                // else swallow the error
-            }
-
-            this.PortalName = Null.SetNullString(dr["PortalName"]);
-            this.LogoFile = Null.SetNullString(dr["LogoFile"]);
-            this.FooterText = Null.SetNullString(dr["FooterText"]);
-            this.ExpiryDate = Null.SetNullDateTime(dr["ExpiryDate"]);
-            this.UserRegistration = Null.SetNullInteger(dr["UserRegistration"]);
-            this.BannerAdvertising = Null.SetNullInteger(dr["BannerAdvertising"]);
-            this.AdministratorId = Null.SetNullInteger(dr["AdministratorID"]);
-            this.Email = Null.SetNullString(dr["Email"]);
-            this.Currency = Null.SetNullString(dr["Currency"]);
-            this.HostFee = Null.SetNullInteger(dr["HostFee"]);
-            this.HostSpace = Null.SetNullInteger(dr["HostSpace"]);
-            this.PageQuota = Null.SetNullInteger(dr["PageQuota"]);
-            this.UserQuota = Null.SetNullInteger(dr["UserQuota"]);
-            this.AdministratorRoleId = Null.SetNullInteger(dr["AdministratorRoleID"]);
-            this.RegisteredRoleId = Null.SetNullInteger(dr["RegisteredRoleID"]);
-            this.Description = Null.SetNullString(dr["Description"]);
-            this.KeyWords = Null.SetNullString(dr["KeyWords"]);
-            this.BackgroundFile = Null.SetNullString(dr["BackGroundFile"]);
-            this.GUID = new Guid(Null.SetNullString(dr["GUID"]));
-            this.PaymentProcessor = Null.SetNullString(dr["PaymentProcessor"]);
-            this.ProcessorUserId = Null.SetNullString(dr["ProcessorUserId"]);
-            var p = Null.SetNullString(dr["ProcessorPassword"]);
-            try
-            {
-                this.ProcessorPassword = string.IsNullOrEmpty(p)
-                    ? p
-                    : Security.FIPSCompliant.DecryptAES(p, Config.GetDecryptionkey(), Host.Host.GUID);
-            }
-            catch (Exception ex) when (ex is FormatException || ex is CryptographicException)
-            {
-                // for backward compatibility
-                this.ProcessorPassword = p;
-            }
-
-            this.SplashTabId = Null.SetNullInteger(dr["SplashTabID"]);
-            this.HomeTabId = Null.SetNullInteger(dr["HomeTabID"]);
-            this.LoginTabId = Null.SetNullInteger(dr["LoginTabID"]);
-            this.RegisterTabId = Null.SetNullInteger(dr["RegisterTabID"]);
-            this.UserTabId = Null.SetNullInteger(dr["UserTabID"]);
-            this.SearchTabId = Null.SetNullInteger(dr["SearchTabID"]);
-
-            this.Custom404TabId = this.Custom500TabId = Null.NullInteger;
-            var schema = dr.GetSchemaTable();
-            if (schema != null)
-            {
-                if (schema.Select("ColumnName = 'Custom404TabId'").Length > 0)
-                {
-                    this.Custom404TabId = Null.SetNullInteger(dr["Custom404TabId"]);
-                }
-
-                if (schema.Select("ColumnName = 'Custom500TabId'").Length > 0)
-                {
-                    this.Custom500TabId = Null.SetNullInteger(dr["Custom500TabId"]);
-                }
-            }
-
-            this.TermsTabId = Null.SetNullInteger(dr["TermsTabId"]);
-            this.PrivacyTabId = Null.SetNullInteger(dr["PrivacyTabId"]);
-
-            this.DefaultLanguage = Null.SetNullString(dr["DefaultLanguage"]);
-#pragma warning disable 612,618 //needed for upgrades and backwards compatibility
-            this.TimeZoneOffset = Null.SetNullInteger(dr["TimeZoneOffset"]);
-#pragma warning restore 612,618
-            this.AdminTabId = Null.SetNullInteger(dr["AdminTabID"]);
-            this.HomeDirectory = Null.SetNullString(dr["HomeDirectory"]);
-            this.SuperTabId = Null.SetNullInteger(dr["SuperTabId"]);
-            this.CultureCode = Null.SetNullString(dr["CultureCode"]);
-
-            this.FillInternal(dr);
-            this.AdministratorRoleName = Null.NullString;
-            this.RegisteredRoleName = Null.NullString;
-
-            this.Users = Null.NullInteger;
-            this.Pages = Null.NullInteger;
-        }
-    }
-}
+    /// <summary>
+    /// PortalInfo provides a base class for Portal information
+    /// This class inherites from the <c>BaseEntityInfo</c> and is <c>Hydratable</c>.
+    /// </summary>
+    /// <remarks><seealso cref="IHydratable"/>
+    /// <example>This example shows how the <c>PortalInfo</c> class is used to get physical file names
+    ///  <code lang="vbnet">
+    /// Public ReadOnly Property PhysicalPath() As String
+    ///        Get
+    ///            Dim _PhysicalPath As String
+    ///            Dim PortalSettings As PortalSettings = Nothing
+    ///            If Not HttpContext.Current Is Nothing Then
+    ///                PortalSettings = PortalController.Instance.GetCurrentPortalSettings()
+    ///            End If
+    ///            If PortalId = Null.NullInteger Then
+    ///                _PhysicalPath = DotNetNuke.Common.Globals.HostMapPath + RelativePath
+    ///            Else
+    ///                If PortalSettings Is Nothing OrElse PortalSettings.PortalId &lt;&gt; PortalId Then
+    ///                    ' Get the PortalInfo  based on the Portalid
+    ///                    Dim objPortals As New PortalController()
+    ///                    Dim objPortal As PortalInfo = objPortals.GetPortal(PortalId)
+    ///                    _PhysicalPath = objPortal.HomeDirectoryMapPath + RelativePath
+    ///                Else
+    ///                    _PhysicalPath = PortalSettings.HomeDirectoryMapPath + RelativePath
+    ///                End If
+    ///            End If
+    ///            Return _PhysicalPath.Replace("/", "\")
+    ///        End Get
+    /// End Property
+    /// </code>
+    /// </example>
+    /// </remarks>
+    [XmlRoot("settings", IsNullable = false)]
+    [Serializable]
+    public class PortalInfo : BaseEntityInfo, IHydratable, IPortalInfo
+    {
+        private string _administratorRoleName;
+        private int _pages = Null.NullInteger;
+        private string _registeredRoleName;
+
+        private int _users;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PortalInfo"/> class.
+        /// Create new Portalinfo instance.
+        /// </summary>
+        /// <remarks>
+        /// <example>This example illustrates the creation of a new <c>PortalInfo</c> object
+        /// <code lang="vbnet">
+        /// For Each portal As PortalInfo In New PortalController().GetPortals
+        ///     Dim portalID As Integer = portal.PortalID
+        ///     ...
+        /// Next
+        /// </code>
+        /// </example>
+        /// </remarks>
+        public PortalInfo()
+        {
+            this.Users = Null.NullInteger;
+        }
+
+        /// <inheritdoc />
+        [XmlElement("footertext")]
+        public string FooterText { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("homedirectory")]
+        public string HomeDirectory { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("homesystemdirectory")]
+        public string HomeSystemDirectory
+        {
+            get { return string.Format("{0}-System", this.HomeDirectory); }
+        }
+
+        /// <inheritdoc />
+        [XmlIgnore]
+        public string HomeDirectoryMapPath
+        {
+            get
+            {
+                return string.Format("{0}\\{1}\\", Globals.ApplicationMapPath, this.HomeDirectory.Replace("/", "\\"));
+            }
+        }
+
+        /// <inheritdoc />
+        [XmlIgnore]
+        public string HomeSystemDirectoryMapPath
+        {
+            get
+            {
+                return string.Format("{0}\\{1}\\", Globals.ApplicationMapPath, this.HomeSystemDirectory.Replace("/", "\\"));
+            }
+        }
+
+        /// <inheritdoc />
+        [XmlElement("administratorid")]
+        public int AdministratorId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("administratorroleid")]
+        public int AdministratorRoleId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("admintabid")]
+        public int AdminTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets image (bitmap) file that is used as background for the portal.
+        /// </summary>
+        /// <value>Name of the file that is used as background.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("backgroundfile")]
+        public string BackgroundFile { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("crmversion")]
+        public string CrmVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets setting for the type of banner advertising in the portal.
+        /// </summary>
+        /// <value>Type of banner advertising.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("banneradvertising")]
+        public int BannerAdvertising { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("cultureCode")]
+        public string CultureCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets curreny format that is used in the portal.
+        /// </summary>
+        /// <value>Currency of the portal.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("currency")]
+        public string Currency { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("defaultlanguage")]
+        public string DefaultLanguage { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("description")]
+        public string Description { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("email")]
+        public string Email { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("expirydate")]
+        public DateTime ExpiryDate { get; set; }
+
+        /// <inheritdoc />
+        [XmlIgnore]
+        public Guid GUID { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("hometabid")]
+        public int HomeTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets amount of currency that is used as a hosting fee of the portal.
+        /// </summary>
+        /// <value>Currency amount hosting fee.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("hostfee")]
+        public float HostFee { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("hostspace")]
+        public int HostSpace { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("keywords")]
+        public string KeyWords { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("logintabid")]
+        public int LoginTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("logofile")]
+        public string LogoFile { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("pagequota")]
+        public int PageQuota { get; set; }
+
+        /// <summary>
+        /// Gets or sets name of the Payment processor that is used for portal payments, e.g. PayPal.
+        /// </summary>
+        /// <value>Name of the portal payment processor.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("paymentprocessor")]
+        public string PaymentProcessor { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("portalid")]
+        public int PortalId { get; set; }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalInfo.PortalId instead.")]
+        public int PortalID
+        {
+            get => PortalId;
+            set => PortalId = value;
+        }
+
+        /// <inheritdoc />
+        public int PortalGroupId { get; set; }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasInfo.HttpAlias instead.")]
+        public int PortalGroupID
+        {
+            get => PortalGroupId;
+            set => PortalGroupId = value;
+        }
+
+        /// <inheritdoc />
+        [XmlElement("portalname")]
+        public string PortalName { get; set; }
+
+        /// <summary>
+        /// Gets or sets password to use in the payment processor.
+        /// </summary>
+        /// <value>Payment Processor password.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("processorpassword")]
+        public string ProcessorPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets payment Processor userId.
+        /// </summary>
+        /// <value>
+        /// <placeholder>Payment Processor userId</placeholder>
+        /// </value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("processoruserid")]
+        public string ProcessorUserId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("registeredroleid")]
+        public int RegisteredRoleId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("registertabid")]
+        public int RegisterTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("searchtabid")]
+        public int SearchTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("custom404tabid")]
+        public int Custom404TabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("custom500tabid")]
+        public int Custom500TabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("termstabid")]
+        public int TermsTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("privacytabid")]
+        public int PrivacyTabId { get; set; }
+
+        [XmlElement("siteloghistory")]
+        [Obsolete("Deprecated in 8.0.0. Scheduled removal in v11.0.0.")]
+        public int SiteLogHistory { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("splashtabid")]
+        public int SplashTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("supertabid")]
+        public int SuperTabId { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("userquota")]
+        public int UserQuota { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("userregistration")]
+        public int UserRegistration { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("usertabid")]
+        public int UserTabId { get; set; }
+
+        /// <summary>
+        /// Gets or sets actual number of actual users for this portal.
+        /// </summary>
+        /// <value>Number of users for the portal.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("users")]
+        public int Users
+        {
+            get
+            {
+                if (this._users < 0)
+                {
+                    this._users = UserController.GetUserCountByPortal(this.PortalID);
+                }
+
+                return this._users;
+            }
+
+            set { this._users = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets dNN Version # of the portal installation.
+        /// </summary>
+        /// <value>Version # of the portal installation.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("version")]
+        public string Version { get; set; }
+
+        /// <inheritdoc />
+        [XmlElement("administratorrolename")]
+        public string AdministratorRoleName
+        {
+            get
+            {
+                if (this._administratorRoleName == Null.NullString && this.AdministratorRoleId > Null.NullInteger)
+                {
+                    // Get Role Name
+                    RoleInfo adminRole = RoleController.Instance.GetRole(this.PortalID, r => r.RoleID == this.AdministratorRoleId);
+                    if (adminRole != null)
+                    {
+                        this._administratorRoleName = adminRole.RoleName;
+                    }
+                }
+
+                return this._administratorRoleName;
+            }
+
+            set
+            {
+                this._administratorRoleName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets actual number of pages of the portal.
+        /// </summary>
+        /// <value>Number of pages of the portal.</value>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v10.0.0.")]
+        [XmlElement("pages")]
+        public int Pages
+        {
+            get
+            {
+                if (this._pages < 0)
+                {
+                    this._pages = TabController.Instance.GetUserTabsByPortal(this.PortalID).Count;
+                }
+
+                return this._pages;
+            }
+
+            set
+            {
+                this._pages = value;
+            }
+        }
+
+        /// <inheritdoc />
+        [XmlElement("registeredrolename")]
+        public string RegisteredRoleName
+        {
+            get
+            {
+                if (this._registeredRoleName == Null.NullString && this.RegisteredRoleId > Null.NullInteger)
+                {
+                    // Get Role Name
+                    RoleInfo regUsersRole = RoleController.Instance.GetRole(this.PortalID, r => r.RoleID == this.RegisteredRoleId);
+                    if (regUsersRole != null)
+                    {
+                        this._registeredRoleName = regUsersRole.RoleName;
+                    }
+                }
+
+                return this._registeredRoleName;
+            }
+
+            set
+            {
+                this._registeredRoleName = value;
+            }
+        }
+
+        [XmlIgnore]
+        [Obsolete("Deprecated in DNN 6.0. Scheduled removal in v10.0.0.")]
+        public int TimeZoneOffset { get; set; }
+
+        /// <inheritdoc />
+        public int KeyID
+        {
+            get
+            {
+                return this.PortalID;
+            }
+
+            set
+            {
+                this.PortalID = value;
+            }
+        }
+
+        /// <summary>
+        /// Fills a PortalInfo from a Data Reader.
+        /// </summary>
+        /// <param name="dr">The Data Reader to use.</param>
+        /// <remarks>Standard IHydratable.Fill implementation.
+        /// <seealso cref="KeyID"></seealso></remarks>
+        public void Fill(IDataReader dr)
+        {
+            this.PortalId = Null.SetNullInteger(dr["PortalID"]);
+
+            try
+            {
+                this.PortalGroupId = Null.SetNullInteger(dr["PortalGroupID"]);
+            }
+            catch (IndexOutOfRangeException)
+            {
+                if (Globals.Status == Globals.UpgradeStatus.None)
+                {
+                    // this should not happen outside of an upgrade situation
+                    throw;
+                }
+
+                // else swallow the error
+            }
+
+            this.PortalName = Null.SetNullString(dr["PortalName"]);
+            this.LogoFile = Null.SetNullString(dr["LogoFile"]);
+            this.FooterText = Null.SetNullString(dr["FooterText"]);
+            this.ExpiryDate = Null.SetNullDateTime(dr["ExpiryDate"]);
+            this.UserRegistration = Null.SetNullInteger(dr["UserRegistration"]);
+            this.BannerAdvertising = Null.SetNullInteger(dr["BannerAdvertising"]);
+            this.AdministratorId = Null.SetNullInteger(dr["AdministratorID"]);
+            this.Email = Null.SetNullString(dr["Email"]);
+            this.Currency = Null.SetNullString(dr["Currency"]);
+            this.HostFee = Null.SetNullInteger(dr["HostFee"]);
+            this.HostSpace = Null.SetNullInteger(dr["HostSpace"]);
+            this.PageQuota = Null.SetNullInteger(dr["PageQuota"]);
+            this.UserQuota = Null.SetNullInteger(dr["UserQuota"]);
+            this.AdministratorRoleId = Null.SetNullInteger(dr["AdministratorRoleID"]);
+            this.RegisteredRoleId = Null.SetNullInteger(dr["RegisteredRoleID"]);
+            this.Description = Null.SetNullString(dr["Description"]);
+            this.KeyWords = Null.SetNullString(dr["KeyWords"]);
+            this.BackgroundFile = Null.SetNullString(dr["BackGroundFile"]);
+            this.GUID = new Guid(Null.SetNullString(dr["GUID"]));
+            this.PaymentProcessor = Null.SetNullString(dr["PaymentProcessor"]);
+            this.ProcessorUserId = Null.SetNullString(dr["ProcessorUserId"]);
+            var p = Null.SetNullString(dr["ProcessorPassword"]);
+            try
+            {
+                this.ProcessorPassword = string.IsNullOrEmpty(p)
+                    ? p
+                    : Security.FIPSCompliant.DecryptAES(p, Config.GetDecryptionkey(), Host.Host.GUID);
+            }
+            catch (Exception ex) when (ex is FormatException || ex is CryptographicException)
+            {
+                // for backward compatibility
+                this.ProcessorPassword = p;
+            }
+
+            this.SplashTabId = Null.SetNullInteger(dr["SplashTabID"]);
+            this.HomeTabId = Null.SetNullInteger(dr["HomeTabID"]);
+            this.LoginTabId = Null.SetNullInteger(dr["LoginTabID"]);
+            this.RegisterTabId = Null.SetNullInteger(dr["RegisterTabID"]);
+            this.UserTabId = Null.SetNullInteger(dr["UserTabID"]);
+            this.SearchTabId = Null.SetNullInteger(dr["SearchTabID"]);
+
+            this.Custom404TabId = this.Custom500TabId = Null.NullInteger;
+            var schema = dr.GetSchemaTable();
+            if (schema != null)
+            {
+                if (schema.Select("ColumnName = 'Custom404TabId'").Length > 0)
+                {
+                    this.Custom404TabId = Null.SetNullInteger(dr["Custom404TabId"]);
+                }
+
+                if (schema.Select("ColumnName = 'Custom500TabId'").Length > 0)
+                {
+                    this.Custom500TabId = Null.SetNullInteger(dr["Custom500TabId"]);
+                }
+            }
+
+            this.TermsTabId = Null.SetNullInteger(dr["TermsTabId"]);
+            this.PrivacyTabId = Null.SetNullInteger(dr["PrivacyTabId"]);
+
+            this.DefaultLanguage = Null.SetNullString(dr["DefaultLanguage"]);
+#pragma warning disable 612,618 //needed for upgrades and backwards compatibility
+            this.TimeZoneOffset = Null.SetNullInteger(dr["TimeZoneOffset"]);
+#pragma warning restore 612,618
+            this.AdminTabId = Null.SetNullInteger(dr["AdminTabID"]);
+            this.HomeDirectory = Null.SetNullString(dr["HomeDirectory"]);
+            this.SuperTabId = Null.SetNullInteger(dr["SuperTabId"]);
+            this.CultureCode = Null.SetNullString(dr["CultureCode"]);
+
+            this.FillInternal(dr);
+            this.AdministratorRoleName = Null.NullString;
+            this.RegisteredRoleName = Null.NullString;
+
+            this.Users = Null.NullInteger;
+            this.Pages = Null.NullInteger;
+        }
+    }
+}
diff --git a/DNN Platform/Library/Entities/Urls/BrowserTypes.cs b/DNN Platform/Library/Entities/Urls/BrowserTypes.cs
index 0b65b119418..29eaf4aed15 100644
--- a/DNN Platform/Library/Entities/Urls/BrowserTypes.cs	
+++ b/DNN Platform/Library/Entities/Urls/BrowserTypes.cs	
@@ -3,10 +3,13 @@
 // See the LICENSE file in the project root for more information
 
 namespace DotNetNuke.Entities.Urls
-{
+{
+    using System;
+
+    [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Urls.BrowserTypes instead.")]
     public enum BrowserTypes
     {
-        Normal,
-        Mobile,
+        Normal = 0,
+        Mobile = 1,
     }
 }
diff --git a/DNN Platform/Library/Entities/Users/IUserController.cs b/DNN Platform/Library/Entities/Users/IUserController.cs
index 513a74e83d7..d5faef1e76a 100644
--- a/DNN Platform/Library/Entities/Users/IUserController.cs	
+++ b/DNN Platform/Library/Entities/Users/IUserController.cs	
@@ -6,10 +6,23 @@ namespace DotNetNuke.Entities.Users
 {
     using System.Collections.Generic;
 
+    /// <summary>
+    /// Provides access to manage users.
+    /// </summary>
     public interface IUserController
-    {
+    {
+        /// <summary>
+        /// Gets the current logged in user information.
+        /// </summary>
+        /// <returns>A <see cref="UserInfo"/> object.</returns>
         UserInfo GetCurrentUserInfo();
-
+
+        /// <summary>
+        /// Gets a specific user informaiton.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id on which to get the user from.</param>
+        /// <param name="userId">The user id to get the information for.</param>
+        /// <returns>A <see cref="UserInfo"/> object.</returns>
         UserInfo GetUser(int portalId, int userId);
 
         /// <summary>
@@ -23,8 +36,6 @@ public interface IUserController
         /// <summary>
         /// GetUser retrieves a User from the DataStore.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
         /// <param name="portalId">The Id of the Portal.</param>
         /// <param name="userId">The Id of the user being retrieved from the Data Store.</param>
         /// <returns>The User as a UserInfo object.</returns>
@@ -46,9 +57,19 @@ public interface IUserController
         /// <param name="propertyNames">list of property names to filter.</param>
         /// <param name="propertyValues">list of property values to filter.</param>
         /// <returns>Users as a list of UserInfo objects.</returns>
-        IList<UserInfo> GetUsersAdvancedSearch(int portalId, int userId, int filterUserId, int filterRoleId, int relationTypeId,
-            bool isAdmin, int pageIndex, int pageSize, string sortColumn,
-            bool sortAscending, string propertyNames, string propertyValues);
+        IList<UserInfo> GetUsersAdvancedSearch(
+            int portalId,
+            int userId,
+            int filterUserId,
+            int filterRoleId,
+            int relationTypeId,
+            bool isAdmin,
+            int pageIndex,
+            int pageSize,
+            string sortColumn,
+            bool sortAscending,
+            string propertyNames,
+            string propertyValues);
 
         /// <summary>
         /// Get a filtered list of users based on a set of simple filters - utilised for basic searches.
@@ -61,8 +82,14 @@ IList<UserInfo> GetUsersAdvancedSearch(int portalId, int userId, int filterUserI
         /// <param name="propertyName">list of property names to filter.</param>
         /// <param name="propertyValue">list of property values to filter.</param>
         /// <returns>Users as a list of UserInfo objects.</returns>
-        IList<UserInfo> GetUsersBasicSearch(int portalId, int pageIndex, int pageSize, string sortColumn,
-            bool sortAscending, string propertyName, string propertyValue);
+        IList<UserInfo> GetUsersBasicSearch(
+            int portalId,
+            int pageIndex,
+            int pageSize,
+            string sortColumn,
+            bool sortAscending,
+            string propertyName,
+            string propertyValue);
 
         /// <summary>
         /// Return User Profile Picture relative Url.
diff --git a/DNN Platform/Library/Entities/Users/UserController.cs b/DNN Platform/Library/Entities/Users/UserController.cs
index ea2eb0f43e6..e36232d4f6d 100644
--- a/DNN Platform/Library/Entities/Users/UserController.cs	
+++ b/DNN Platform/Library/Entities/Users/UserController.cs	
@@ -13,6 +13,7 @@ namespace DotNetNuke.Entities.Users
     using System.Threading;
     using System.Web;
 
+    using DotNetNuke.Abstractions.Portals;
     using DotNetNuke.Collections.Internal;
     using DotNetNuke.Common;
     using DotNetNuke.Common.Utilities;
@@ -61,16 +62,21 @@ namespace DotNetNuke.Entities.Users
     /// -----------------------------------------------------------------------------
     public partial class UserController : ServiceLocator<IUserController, UserController>, IUserController
     {
+        /// <summary>
+        /// Gets or sets the display name format with support for replacing some tokens.
+        /// </summary>
+        /// <remarks>Valid tokens are: [USERID], [FIRSTNAME], [LASTNAME] and [USERNAME].</remarks>
         public string DisplayFormat { get; set; }
 
+        /// <summary>
+        /// Gets or sets the site (portal) id.
+        /// </summary>
         public int PortalId { get; set; }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Gets the number count for all duplicate e-mail adresses in the database.
         /// </summary>
-        /// <returns></returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>An integer representing the amount of duplicate emails.</returns>
         public static int GetDuplicateEmailCount()
         {
             return DataProvider.Instance().GetDuplicateEmailCount(PortalSettings.Current.PortalId);
@@ -130,23 +136,20 @@ public static void ResetTermsAgreement(int portalId)
         /// so further processing may occur manually by the site admins.
         /// </summary>
         /// <param name="user">The user that desires to be removed.</param>
+        /// <param name="remove">A value indicating whether the user has requested removal.</param>
         public static void UserRequestsRemoval(UserInfo user, bool remove)
         {
             Requires.NotNull("user", user);
             MembershipProvider.Instance().UserRequestsRemoval(user, remove);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// ChangePassword attempts to change the users password.
+        /// Attempts to change the users password.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
         /// <param name="user">The user to update.</param>
         /// <param name="oldPassword">The old password.</param>
         /// <param name="newPassword">The new password.</param>
         /// <returns>A Boolean indicating success or failure.</returns>
-        /// -----------------------------------------------------------------------------
         public static bool ChangePassword(UserInfo user, string oldPassword, string newPassword)
         {
             bool passwordChanged;
@@ -173,12 +176,13 @@ public static bool ChangePassword(UserInfo user, string oldPassword, string newP
         }
 
         /// <summary>
-        /// overload will validate the token and if valid change the password
-        /// it does not require an old password as it supports hashed passwords.
+        /// Validates the password reset token and if valid changes the password.
         /// </summary>
+        /// <param name="portalid">The site (portal) id on which the user exists.</param>
+        /// <param name="username">The username of the user to change the password for.</param>
         /// <param name="newPassword">The new password.</param>
-        /// /// <param name="resetToken">The reset token, typically supplied through a password reset email.</param>
-        /// <returns>A Boolean indicating success or failure.</returns>
+        /// <param name="resetToken">The reset token, typically supplied through a password reset email.</param>
+        /// <returns>A Boolean indicating whether the password change succeeded.</returns>
         public static bool ChangePasswordByToken(int portalid, string username, string newPassword, string resetToken)
         {
             bool passwordChanged;
@@ -231,14 +235,22 @@ public static bool ChangePasswordByToken(int portalid, string username, string n
         }
 
         /// <summary>
-        /// overload will validate the token and if valid change the password
-        /// it does not require an old password as it supports hashed passwords
-        /// errorMessage will define why reset failed.
+        /// Validates the password reset token and changes the password if valid.
         /// </summary>
+        /// <param name="portalid">The site (portal) id where the user exists.</param>
+        /// <param name="username">The username of the user to change the password for.</param>
         /// <param name="newPassword">The new password.</param>
-        /// <param name="resetToken">The reset token, typically supplied through a password reset email.</param>
+        /// <param name="answer">The password reset question/answer answer.</param>
+        /// <param name="resetToken">The password reset token, typically supplied through a password reset email.</param>
+        /// <param name="errorMessage">If the attempt fails, this parameter will contain the reason.</param>
         /// <returns>A Boolean indicating success or failure.</returns>
-        public static bool ChangePasswordByToken(int portalid, string username, string newPassword, string answer, string resetToken, out string errorMessage)
+        public static bool ChangePasswordByToken(
+            int portalid,
+            string username,
+            string newPassword,
+            string answer,
+            string resetToken,
+            out string errorMessage)
         {
             bool passwordChanged;
             errorMessage = Null.NullString;
@@ -306,22 +318,17 @@ public static bool ChangePasswordByToken(int portalid, string username, string n
             return passwordChanged;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// ChangePasswordQuestionAndAnswer attempts to change the users password Question
-        /// and PasswordAnswer.
+        /// Attempts to change the users password reset question and answer.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
         /// <param name="user">The user to update.</param>
         /// <param name="password">The password.</param>
         /// <param name="passwordQuestion">The new password question.</param>
         /// <param name="passwordAnswer">The new password answer.</param>
         /// <returns>A Boolean indicating success or failure.</returns>
-        /// -----------------------------------------------------------------------------
         public static bool ChangePasswordQuestionAndAnswer(UserInfo user, string password, string passwordQuestion, string passwordAnswer)
         {
-            EventLogController.Instance.AddLog(user, PortalController.Instance.GetCurrentPortalSettings(), GetCurrentUserInternal().UserID, string.Empty, EventLogController.EventLogType.USER_UPDATED);
+            EventLogController.Instance.AddLog(user, PortalController.Instance.GetCurrentSettings(), GetCurrentUserInternal().UserID, string.Empty, EventLogController.EventLogType.USER_UPDATED);
             return MembershipProvider.Instance().ChangePasswordQuestionAndAnswer(user, password, passwordQuestion, passwordAnswer);
         }
 
@@ -336,6 +343,16 @@ public static void ChangeUsername(int userId, string newUsername)
             MembershipProvider.Instance().ChangeUsername(userId, newUsername);
         }
 
+        /// <summary>
+        /// Checks if the user has known default username and password.
+        /// </summary>
+        /// <param name="username">The user username.</param>
+        /// <param name="password">The user password.</param>
+        /// <param name="loginStatus">
+        /// If a known default username and password is used, will return
+        /// <see cref="UserLoginStatus.LOGIN_INSECUREADMINPASSWORD"/> or
+        /// <see cref="UserLoginStatus.LOGIN_INSECUREHOSTPASSWORD"/>.
+        /// </param>
         public static void CheckInsecurePassword(string username, string password, ref UserLoginStatus loginStatus)
         {
             if (username == "admin" && (password == "admin" || password == "dnnadmin"))
@@ -389,24 +406,20 @@ public static void CopyUserToPortal(UserInfo user, PortalInfo destinationPortal,
         /// <summary>
         /// Creates a new User in the Data Store.
         /// </summary>
-        /// <remarks></remarks>
         /// <param name="user">The userInfo object to persist to the Database.</param>
-        /// <returns>The Created status ot the User.</returns>
+        /// <returns>The <see cref="UserCreateStatus"/> ot the User.</returns>
         /// -----------------------------------------------------------------------------
         public static UserCreateStatus CreateUser(ref UserInfo user)
         {
             return CreateUser(ref user, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Creates a new User in the Data Store.
+        /// Creates a new User in the Data Store optionally sending an email notification.
         /// </summary>
-        /// <remarks></remarks>
-        /// <param name="user">The userInfo object to persist to the Database.</param>
-        /// <param name="sendEmailNotification">The sendEmailNotification flag defines whether registration email will be sent to user.</param>
-        /// <returns>The Created status ot the User.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="user">The <see cref="UserInfo"/> object to persist to the Database.</param>
+        /// <param name="sendEmailNotification">A value indicating whether a registration email will be sent to user.</param>
+        /// <returns>The <see cref="UserCreateStatus"/> of the User.</returns>
         public static UserCreateStatus CreateUser(ref UserInfo user, bool sendEmailNotification)
         {
             int portalId = user.PortalID;
@@ -427,7 +440,7 @@ public static UserCreateStatus CreateUser(ref UserInfo user, bool sendEmailNotif
                 user.PasswordResetExpiration = passwordExpiry;
                 user.PasswordResetToken = passwordGuid;
                 UpdateUser(user.PortalID, user);
-                EventLogController.Instance.AddLog(user, PortalController.Instance.GetCurrentPortalSettings(), GetCurrentUserInternal().UserID, string.Empty, EventLogController.EventLogType.USER_CREATED);
+                EventLogController.Instance.AddLog(user, PortalController.Instance.GetCurrentSettings(), GetCurrentUserInternal().UserID, string.Empty, EventLogController.EventLogType.USER_CREATED);
                 CachingProvider.Instance().Remove(string.Format(DataCache.PortalUserCountCacheKey, portalId));
                 if (!user.IsSuperUser)
                 {
@@ -443,16 +456,12 @@ public static UserCreateStatus CreateUser(ref UserInfo user, bool sendEmailNotif
             return createStatus;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Deletes all Unauthorized Users for a Portal.
         /// </summary>
-        /// <remarks></remarks>
         /// <param name="portalId">The Id of the Portal.</param>
-        /// -----------------------------------------------------------------------------
         public static void DeleteUnauthorizedUsers(int portalId)
         {
-            // DNN-6924 for superusers call GetUsers(includeDeleted, superUsersOnly, portalId)
             var arrUsers = (portalId == -1) ? GetUsers(true, true, portalId) : GetUnAuthorizedUsers(portalId);
             for (int i = 0; i < arrUsers.Count; i++)
             {
@@ -467,16 +476,13 @@ public static void DeleteUnauthorizedUsers(int portalId)
             }
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Deletes an existing User from the Data Store.
         /// </summary>
-        /// <remarks></remarks>
         /// <param name="user">The userInfo object to delete from the Database.</param>
         /// <param name="notify">A flag that indicates whether an email notification should be sent.</param>
         /// <param name="deleteAdmin">A flag that indicates whether the Portal Administrator should be deleted.</param>
         /// <returns>A Boolean value that indicates whether the User was successfully deleted.</returns>
-        /// -----------------------------------------------------------------------------
         public static bool DeleteUser(ref UserInfo user, bool notify, bool deleteAdmin)
         {
             int portalId = user.PortalID;
@@ -533,15 +539,12 @@ public static bool DeleteUser(ref UserInfo user, bool notify, bool deleteAdmin)
             return canDelete;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Deletes all Users for a Portal.
         /// </summary>
-        /// <remarks></remarks>
         /// <param name="portalId">The Id of the Portal.</param>
         /// <param name="notify">A flag that indicates whether an email notification should be sent.</param>
         /// <param name="deleteAdmin">A flag that indicates whether the Portal Administrator should be deleted.</param>
-        /// -----------------------------------------------------------------------------
         public static void DeleteUsers(int portalId, bool notify, bool deleteAdmin)
         {
             var arrUsers = GetUsers(portalId);
@@ -552,45 +555,36 @@ public static void DeleteUsers(int portalId, bool notify, bool deleteAdmin)
             }
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Generates a new random password (Length = Minimum Length + 4).
+        /// Generates a new random password.
         /// </summary>
-        /// <returns>A String.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A string representing the randomly generated password which is the minimum password length + 4 characters.</returns>
         public static string GeneratePassword()
         {
             return GeneratePassword(MembershipProviderConfig.MinPasswordLength + 4);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Generates a new random password.
         /// </summary>
         /// <param name="length">The length of password to generate.</param>
-        /// <returns>A String.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A string representing the newly generated random password.</returns>
         public static string GeneratePassword(int length)
         {
             return MembershipProvider.Instance().GeneratePassword(length);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetCachedUser retrieves the User from the Cache, or fetches a fresh copy if
-        /// not in cache or if Cache settings not set to HeavyCaching.
+        /// Retrieves the User from the Cache, or fetches a fresh copy if
+        /// not in cache or if Cache settings are not set to HeavyCaching.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
         /// <param name="portalId">The Id of the Portal.</param>
         /// <param name="username">The username of the user being retrieved.</param>
-        /// <returns>The User as a UserInfo object.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>The user as a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetCachedUser(int portalId, string username)
         {
             var masterPortalId = GetEffectivePortalId(portalId);
 
-            // user is cached inside the MembershipProvider.Instance().GetUserByUserName method
             var user = MembershipProvider.Instance().GetUserByUserName(masterPortalId, username);
             FixMemberPortalId(user, portalId);
 
@@ -606,34 +600,38 @@ public static UserInfo GetCachedUser(int portalId, string username)
             return user;
         }
 
+        /// <summary>
+        /// Gets deleted users for a portal.
+        /// </summary>
+        /// <param name="portalId">The portal id for which to get the deleted users.</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/>.</returns>
         public static ArrayList GetDeletedUsers(int portalId)
         {
             return MembershipProvider.Instance().GetDeletedUsers(GetEffectivePortalId(portalId));
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Gets a collection of Online Users.
         /// </summary>
         /// <param name="portalId">The Id of the Portal.</param>
         /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
         [Obsolete("Support for users online was removed in 8.x, other solutions exist outside of the DNN Platform.  Scheduled removal in v11.0.0.")]
         public static ArrayList GetOnlineUsers(int portalId)
         {
             return MembershipProvider.Instance().GetOnlineUsers(GetEffectivePortalId(portalId));
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
         /// Gets the Current Password Information for the User.
         /// </summary>
-        /// <remarks>This method will only return the password if the memberProvider supports
-        /// and is using a password encryption method that supports decryption.</remarks>
+        /// <remarks>
+        /// This method will only return the password if the memberProvider supports
+        /// and is using a password encryption method that supports decryption.
+        /// </remarks>
         /// <param name="user">The user whose Password information we are retrieving.</param>
-        /// <param name="passwordAnswer">The answer to the "user's" password Question.</param>
-        /// <returns></returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="passwordAnswer">The answer to the user's password Question.</param>
+        /// <returns>A string representing the user password.</returns>
+        /// <exception cref="ConfigurationErrorsException">is thrown if the current configuration does not allow password retrieval.</exception>
         public static string GetPassword(ref UserInfo user, string passwordAnswer)
         {
             if (MembershipProviderConfig.PasswordRetrievalEnabled)
@@ -649,35 +647,34 @@ public static string GetPassword(ref UserInfo user, string passwordAnswer)
             return user.Membership.Password;
         }
 
+        /// <summary>
+        /// Gets the unauthorized users for a portal.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id on which to search for Unauthorized users.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to include superusers (hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/>.</returns>
         public static ArrayList GetUnAuthorizedUsers(int portalId, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUnAuthorizedUsers(GetEffectivePortalId(portalId), includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUnAuthorizedUsers gets all the users of the portal, that are not authorized.
+        /// Gets all the users of the portal, that are not authorized.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The Id of the site (portal).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUnAuthorizedUsers(int portalId)
         {
             return GetUnAuthorizedUsers(portalId, false, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUser retrieves a User from the DataStore.
+        /// Gets a User from the DataStore.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <param name="userId">The Id of the user being retrieved from the Data Store.</param>
-        /// <returns>The User as a UserInfo object.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <param name="userId">The id of the user being retrieved from the Data Store.</param>
+        /// <returns>The User as a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetUserById(int portalId, int userId)
         {
             // stop any sql calls for guest users
@@ -716,56 +713,56 @@ public static UserInfo GetUserById(int portalId, int userId)
             return user;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUserByUserName retrieves a User from the DataStore.
+        /// Gets a User from the DataStore.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
         /// <param name="username">The username of the user being retrieved from the Data Store.</param>
-        /// <returns>The User as a UserInfo object.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>The User as a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetUserByName(string username)
         {
             return MembershipProvider.Instance().GetUserByUserName(-1, username);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUserByUserName retrieves a User from the DataStore.
+        /// Gets a user from the DataStore.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="username">The username of the user being retrieved from the Data Store.</param>
-        /// <returns>The User as a UserInfo object.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>The User as a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetUserByName(int portalId, string username)
         {
             return GetCachedUser(portalId, username);
         }
 
+        /// <summary>
+        /// Gets a user by its vanity url.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id of the user.</param>
+        /// <param name="vanityUrl">The vanity url to search.</param>
+        /// <returns>A user as a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetUserByVanityUrl(int portalId, string vanityUrl)
         {
             portalId = GetEffectivePortalId(portalId);
             return MembershipProvider.Instance().GetUserByVanityUrl(portalId, vanityUrl);
         }
 
+        /// <summary>
+        /// Gets a single user by its password reset token.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id for the user.</param>
+        /// <param name="resetToken">the password reset token.</param>
+        /// <returns>A user represented in a <see cref="UserInfo"/> object.</returns>
         public static UserInfo GetUserByPasswordResetToken(int portalId, string resetToken)
         {
             portalId = GetEffectivePortalId(portalId);
             return MembershipProvider.Instance().GetUserByPasswordResetToken(portalId, resetToken);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUserCountByPortal gets the number of users in the portal.
+        /// Gets the number of users in a site (portal).
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <returns>The no of users.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the portal to search.</param>
+        /// <returns>The no of users the portal contains.</returns>
         public static int GetUserCountByPortal(int portalId)
         {
             portalId = GetEffectivePortalId(portalId);
@@ -773,13 +770,11 @@ public static int GetUserCountByPortal(int portalId)
             return CBO.GetCachedObject<int>(new CacheItemArgs(cacheKey, DataCache.PortalUserCountCacheTimeOut, DataCache.PortalUserCountCachePriority, portalId), GetUserCountByPortalCallBack);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Retruns a String corresponding to the Registration Status of the User.
+        /// Gets a localized string representing the user creation status.
         /// </summary>
-        /// <param name="userRegistrationStatus">The AUserCreateStatus.</param>
-        /// <returns>A String.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="userRegistrationStatus">The user creation status as a <see cref="UserCreateStatus"/>.</param>
+        /// <returns>A localized string representing the user creation status.</returns>
         public static string GetUserCreateStatus(UserCreateStatus userRegistrationStatus)
         {
             switch (userRegistrationStatus)
@@ -826,13 +821,11 @@ public static string GetUserCreateStatus(UserCreateStatus userRegistrationStatus
             }
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Gets the Membership Information for the User.
+        /// Gets the membership information for a user.
         /// </summary>
-        /// <remarks></remarks>
-        /// <param name="user">The user whose Membership information we are retrieving.</param>
-        /// -----------------------------------------------------------------------------
+        /// <param name="user">The user whose membership information to retrieve.</param>
+        /// <remarks>This method does not return the membership information, it populates it inside the <see cref="UserInfo"/> object.</remarks>
         public static void GetUserMembership(UserInfo user)
         {
             int portalId = user.PortalID;
@@ -841,18 +834,14 @@ public static void GetUserMembership(UserInfo user)
             FixMemberPortalId(user, portalId);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Gets the Default Settings for the Module.
+        /// Gets a set of default portal settings relative to user management.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <returns></returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A <see cref="Hashtable"/> or the user related portal settings.</returns>
         public static Hashtable GetDefaultUserSettings()
         {
             var portalId = -1;
-            var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+            var portalSettings = PortalController.Instance.GetCurrentSettings();
 
             if (portalSettings != null)
             {
@@ -862,15 +851,11 @@ public static Hashtable GetDefaultUserSettings()
             return GetUserSettings(portalId, new Hashtable());
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUserSettings retrieves the UserSettings from the User.
+        /// Gets the user related portal settings.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <returns>The Settings Hashtable.</returns>
-        /// -----------------------------------------------------------------------------
         public static Hashtable GetUserSettings(int portalId)
         {
             var settings = GetDefaultUserSettings();
@@ -936,104 +921,78 @@ public static Hashtable GetUserSettings(int portalId)
             return settings;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsers gets all the users of the portal.
+        /// Gets all the users of a given portal.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsers(int portalId)
         {
             return GetUsers(false, false, portalId);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsers gets all the users of the portal.
+        /// Gets the users of a given portal.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to ONLY include SuperUsers (Hosts).</param>
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsers(bool includeDeleted, bool superUsersOnly, int portalId)
         {
             var totalrecords = -1;
             return GetUsers(portalId, -1, -1, ref totalrecords, includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsers gets all the users of the portal, by page.
+        /// Gets all the users of a given portal, excluding deleted users and SuperUsers (Hosts), by page.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records.</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsers(int portalId, int pageIndex, int pageSize, ref int totalRecords)
         {
             return GetUsers(portalId, pageIndex, pageSize, ref totalRecords, false, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsers gets all the users of the portal, by page.
+        /// Gets all the users of a given portal, by page.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to ONLY include superUsers (Hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsers(int portalId, int pageIndex, int pageSize, ref int totalRecords, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUsers(GetEffectivePortalId(portalId), pageIndex, pageSize, ref totalRecords, includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByEmail gets all the users of the portal whose email matches a provided
-        /// filter expression.
+        /// Gets all the users of a given portal whose email matches a provided filter, excluding deleted users and SuperUsers (Hosts).
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="emailToMatch">The email address to use to find a match.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByEmail(int portalId, string emailToMatch, int pageIndex, int pageSize, ref int totalRecords)
         {
             return GetUsersByEmail(portalId, emailToMatch, pageIndex, pageSize, ref totalRecords, false, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUserByEmail gets one single user matching the email address provided
-        /// This will only be useful in portals without duplicate email addresses
-        /// filter expression.
+        /// Gets one single user matching the email address provided, this will only return the first match found.
+        /// This will only be useful in portals without duplicate email addresses.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="emailToMatch">The email address to use to find a match.</param>
-        /// <returns>A single user object or null if no user found.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A single <see cref="UserInfo"/> object or null if no user found.</returns>
         public static UserInfo GetUserByEmail(int portalId, string emailToMatch)
         {
             int uid = DataProvider.Instance().GetSingleUserByEmail(portalId, emailToMatch);
@@ -1045,136 +1004,108 @@ public static UserInfo GetUserByEmail(int portalId, string emailToMatch)
             return null;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByEmail gets all the users of the portal whose email matches a provided
-        /// filter expression.
+        /// Gets all the users of the portal whose email matches a provided filter expression.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="emailToMatch">The email address to use to find a match.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating if the search should ONLY include SuperUsers (Hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByEmail(int portalId, string emailToMatch, int pageIndex, int pageSize, ref int totalRecords, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUsersByEmail(GetEffectivePortalId(portalId), emailToMatch, pageIndex, pageSize, ref totalRecords, includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByProfileProperty gets all the users of the portal whose profile matches
+        /// Gets all the users of the portal whose profile matches
         /// the profile property pased as a parameter.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="propertyName">The name of the property being matched.</param>
         /// <param name="propertyValue">The value of the property being matched.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByProfileProperty(int portalId, string propertyName, string propertyValue, int pageIndex, int pageSize, ref int totalRecords)
         {
             return GetUsersByProfileProperty(portalId, propertyName, propertyValue, pageIndex, pageSize, ref totalRecords, false, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByProfileProperty gets all the users of the portal whose profile matches
+        /// Gets all the users of the portal whose profile matches
         /// the profile property pased as a parameter.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="propertyName">The name of the property being matched.</param>
         /// <param name="propertyValue">The value of the property being matched.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to ONLY include SuperUsers (Hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByProfileProperty(int portalId, string propertyName, string propertyValue, int pageIndex, int pageSize, ref int totalRecords, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUsersByProfileProperty(GetEffectivePortalId(portalId), propertyName, propertyValue, pageIndex, pageSize, ref totalRecords, includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByUserName gets all the users of the portal whose username matches a provided
-        /// filter expression.
+        /// Gets all the users of the portal whose username matches a provided filter expression, excluding deleted users and SuperUsers (Hosts), by page.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="userNameToMatch">The username to use to find a match.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByUserName(int portalId, string userNameToMatch, int pageIndex, int pageSize, ref int totalRecords)
         {
             return GetUsersByUserName(portalId, userNameToMatch, pageIndex, pageSize, ref totalRecords, false, false);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByUserName gets all the users of the portal whose username matches a provided
-        /// filter expression.
+        /// Gets all the users of the portal whose username matches a provided filter expression, by page.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="userNameToMatch">The username to use to find a match.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to ONLY include SuperUsers (Hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByUserName(int portalId, string userNameToMatch, int pageIndex, int pageSize, ref int totalRecords, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUsersByUserName(GetEffectivePortalId(portalId), userNameToMatch, pageIndex, pageSize, ref totalRecords, includeDeleted, superUsersOnly);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUsersByDisplayName gets all the users of the portal whose display name matches a provided
-        /// filter expression.
+        /// Gets all the users of the portal whose display name matches a provided filter expression, by page.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
         /// <param name="nameToMatch">The display name to use to find a match.</param>
         /// <param name="pageIndex">The page of records to return.</param>
-        /// <param name="pageSize">The size of the page.</param>
-        /// <param name="totalRecords">The total no of records that satisfy the criteria.</param>
-        /// <param name="includeDeleted">Include Deleted Users.</param>
-        /// <param name="superUsersOnly">Only get super users.</param>
-        /// <returns>An ArrayList of UserInfo objects.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="totalRecords">The total number of records that satisfy the criteria.</param>
+        /// <param name="includeDeleted">A value indicating whether to include deleted users.</param>
+        /// <param name="superUsersOnly">A value indicating whether to ONLY inlude SuperUsers (Hosts).</param>
+        /// <returns>An ArrayList of <see cref="UserInfo"/> objects.</returns>
         public static ArrayList GetUsersByDisplayName(int portalId, string nameToMatch, int pageIndex, int pageSize, ref int totalRecords, bool includeDeleted, bool superUsersOnly)
         {
             return MembershipProvider.Instance().GetUsersByDisplayName(GetEffectivePortalId(portalId), nameToMatch, pageIndex, pageSize, ref totalRecords, includeDeleted, superUsersOnly);
         }
 
         /// <summary>
-        /// Move a user to a different portal.
+        /// Moves a user to a different site (portal).
         /// </summary>
         /// <param name="user">The user to move.</param>
-        /// <param name="portal">The destination portal.</param>
-        /// <param name="mergeUser">A flag that indicates whether to merge the original user.</param>
+        /// <param name="portal">The destination site (portal).</param>
+        /// <param name="mergeUser">A indicating whether to merge the basic user properties if the user already exists on the target portal.</param>
         public static void MoveUserToPortal(UserInfo user, PortalInfo portal, bool mergeUser)
         {
             CopyUserToPortal(user, portal, mergeUser);
@@ -1182,10 +1113,14 @@ public static void MoveUserToPortal(UserInfo user, PortalInfo portal, bool merge
         }
 
         /// <summary>
-        /// Permanently deletes all users marked as deleted from a portal. It will delete the membership
-        /// user as well if the user has no other portals.
+        /// Permanently removes all users marked as deleted from a portal. It will delete the membership
+        /// user as well if the user is not part of other portals.
         /// </summary>
-        /// <param name="portalId">Portal ID to get the deleted users for.</param>
+        /// <param name="portalId">The id of the site (portal) on which to get the deleted users.</param>
+        /// <remarks>
+        /// In Dnn, a user can be deleted, in which case the user is just disabled or "soft deleted" but still exists in the database and can be restored.
+        /// Removing a user (hard-deleting) actually removes the user information from the DataStore and cannot be undone.
+        /// </remarks>
         public static void RemoveDeletedUsers(int portalId)
         {
             var arrUsers = GetDeletedUsers(portalId);
@@ -1200,33 +1135,42 @@ public static void RemoveDeletedUsers(int portalId)
         }
 
         /// <summary>
-        /// Permanently delete a user and the associated user folder on disk.
+        /// Permanently remove a user and the associated user folder on disk.
         /// This also deletes the membership user if the user is
         /// not a member of any other portal.
         /// </summary>
         /// <param name="user">The user to delete.</param>
-        /// <returns></returns>
+        /// <returns>A value indicating whether the user removal was successfull.</returns>
         public static bool RemoveUser(UserInfo user)
         {
             int portalId = user.PortalID;
             user.PortalID = GetEffectivePortalId(portalId);
 
-            // Remove the User
             var retValue = MembershipProvider.Instance().RemoveUser(user);
 
             if (retValue)
             {
-                // Obtain PortalSettings from Current Context
-                var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+                var portalSettings = PortalController.Instance.GetCurrentSettings();
 
-                // Log event
                 EventLogController.Instance.AddLog("Username", user.Username, portalSettings, user.UserID, EventLogController.EventLogType.USER_REMOVED);
 
-                // Delete userFolder - DNN-3787
-                DeleteUserFolder(user);
-
-                DataCache.ClearPortalCache(portalId, false);
-                DataCache.ClearUserCache(portalId, user.Username);
+                var portal = PortalController.Instance.GetPortal(user.PortalID);
+                var portalGroup = (from p in PortalGroupController.Instance.GetPortalGroups()
+                                   where p.PortalGroupId == portal.PortalGroupID
+                                   select p)
+                                .SingleOrDefault();
+                if (portalGroup != null)
+                {
+                    var portalsInGroup = PortalGroupController.Instance.GetPortalsByGroup(portalGroup.PortalGroupId);
+                    foreach (var portalInGroup in portalsInGroup)
+                    {
+                        ClearPortalAndUserCache(user, portalInGroup.PortalID);
+                    }
+                }
+                else
+                {
+                    ClearPortalAndUserCache(user, portalId);
+                }
 
                 EventManager.Instance.OnUserRemoved(new UserEventArgs { User = user });
             }
@@ -1238,15 +1182,15 @@ public static bool RemoveUser(UserInfo user)
         }
 
         /// <summary>
-        /// reset and change password
-        /// used by admin/host users who do not need to supply an "old" password.
+        /// Resets and changes the password for a user.
         /// </summary>
-        /// <param name="user">user being changed.</param>
-        /// <param name="newPassword">new password.</param>
-        /// <returns></returns>
+        /// <param name="user">The user for which to change the password.</param>
+        /// <param name="newPassword">The new password.</param>
+        /// <returns>A value indicating whether the password change was successfull.</returns>
+        /// <remarks>This method can only be used by admins or superusers (hosts) who do not need to supply an "old" password.</remarks>
         public static bool ResetAndChangePassword(UserInfo user, string newPassword)
         {
-            var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+            var portalSettings = PortalController.Instance.GetCurrentSettings();
             if (GetCurrentUserInternal().IsInRole(portalSettings.AdministratorRoleName))
             {
                 string resetPassword = ResetPassword(user, string.Empty);
@@ -1256,6 +1200,15 @@ public static bool ResetAndChangePassword(UserInfo user, string newPassword)
             return false;
         }
 
+        /// <summary>
+        /// Attempts to reset and change a user password.
+        /// </summary>
+        /// <param name="user">The user for which to change the password.</param>
+        /// <param name="oldPassword">The user old password.</param>
+        /// <param name="newPassword">The user new password.</param>
+        /// <returns>A value indicating whether the password change succeeded.</returns>
+        /// <exception cref="ConfigurationErrorsException"> is thrown if password reset is not enabled in the configuration.</exception>
+        /// <exception cref="Exception"> with a message of "Invalid Password" is thrown if either the old or new password is not valid.</exception>
         public static bool ResetAndChangePassword(UserInfo user, string oldPassword, string newPassword)
         {
             if (System.Web.Security.Membership.ValidateUser(user.Username, oldPassword))
@@ -1267,15 +1220,14 @@ public static bool ResetAndChangePassword(UserInfo user, string oldPassword, str
             return false;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Resets the password for the specified user.
+        /// Attempts to reset the password for the specified user.
         /// </summary>
-        /// <remarks>Resets the user's password.</remarks>
         /// <param name="user">The user whose Password information we are resetting.</param>
         /// <param name="passwordAnswer">The answer to the "user's" password Question.</param>
-        /// <returns></returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A string representing the new password.</returns>
+        /// <exception cref="System.Web.Security.MembershipPasswordException"> is thrown when the password answer is not valid.</exception>
+        /// <exception cref="ConfigurationErrorsException"> is thrown when password reset is not enabled in the configuration.</exception>
         public static string ResetPassword(UserInfo user, string passwordAnswer)
         {
             if (MembershipProviderConfig.PasswordResetEnabled)
@@ -1291,11 +1243,22 @@ public static string ResetPassword(UserInfo user, string passwordAnswer)
             return user.Membership.Password;
         }
 
+        /// <summary>
+        /// Resets the user password reset token.
+        /// </summary>
+        /// <param name="user">The user to update the password reset token for.</param>
+        /// <remarks>This method does not return the new token, it updates it inside the <see cref="UserInfo"/> object provided.</remarks>
         public static void ResetPasswordToken(UserInfo user)
         {
             ResetPasswordToken(user, false);
         }
 
+        /// <summary>
+        /// Resets the user password reset token.
+        /// </summary>
+        /// <param name="user">The user to reset the password reset token for.</param>
+        /// <param name="sendEmail">A value indicating whether to send a notification email to the user.</param>
+        /// <returns>A value indicating whether the notification email was sent or true if 'sendEmail' was false.</returns>
         public static bool ResetPasswordToken(UserInfo user, bool sendEmail)
         {
             var settings = new MembershipPasswordSettings(user.PortalID);
@@ -1321,6 +1284,12 @@ public static bool ResetPasswordToken(UserInfo user, bool sendEmail)
             return true;
         }
 
+        /// <summary>
+        /// Resets the password reset token with a timeout value.
+        /// </summary>
+        /// <param name="user">The user for which to update the password reset token.</param>
+        /// <param name="minutesValid">A value indication for how many minutes the generated token will be valid for.</param>
+        /// <remarks>This method does not return anything, it updates the reset token and the token expiraiton directly in the provided <see cref="UserInfo"/> object.</remarks>
         public static void ResetPasswordToken(UserInfo user, int minutesValid)
         {
             user.PasswordResetExpiration = DateTime.Now.AddMinutes(minutesValid);
@@ -1328,6 +1297,16 @@ public static void ResetPasswordToken(UserInfo user, int minutesValid)
             UpdateUser(user.PortalID, user);
         }
 
+        /// <summary>
+        /// Restores a deleted user.
+        /// </summary>
+        /// <param name="user">The user to restore.</param>
+        /// <returns>A value indicating whether the user restore succeeded.</returns>
+        /// <remarks>
+        /// Dnn supports deleting and restoring them. A deleted using in Dnn means a "soft-delete" or in other words disabling the user.
+        /// This method can only be used for those "soft-deleted" users, if a user was removed (hard-deleted), this method cannot restore the user
+        /// as that action cannot be undone.
+        /// </remarks>
         public static bool RestoreUser(ref UserInfo user)
         {
             int portalId = user.PortalID;
@@ -1342,7 +1321,7 @@ public static bool RestoreUser(ref UserInfo user)
                 RestoreUserPermissions(user);
 
                 // Obtain PortalSettings from Current Context
-                var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+                var portalSettings = PortalController.Instance.GetCurrentSettings();
 
                 // Log event
                 EventLogController.Instance.AddLog("Username", user.Username, portalSettings, user.UserID, EventLogController.EventLogType.USER_RESTORED);
@@ -1357,91 +1336,80 @@ public static bool RestoreUser(ref UserInfo user)
             return retValue;
         }
 
+        /// <summary>
+        /// Gets the setting key prefix for user related portal settings.
+        /// </summary>
+        /// <param name="portalId">The portal id to scope the key for.</param>
+        /// <returns>A string representing the settings key for the given portal.</returns>
         public static string SettingsKey(int portalId)
         {
             return "UserSettings|" + portalId;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Unlocks the User's Account.
+        /// Attempts to unlock the user's account.
         /// </summary>
-        /// <remarks></remarks>
         /// <param name="user">The user whose account is being Unlocked.</param>
-        /// <returns></returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>A value indicating whether the user unlock attempt succeeded.</returns>
+        /// <remarks>A user can be locked in some situations as when the user attempted too many invalid passwords.</remarks>
         public static bool UnLockUser(UserInfo user)
         {
             int portalId = user.PortalID;
             user.PortalID = GetEffectivePortalId(portalId);
 
-            // Unlock the User
             var retValue = MembershipProvider.Instance().UnLockUser(user);
             DataCache.ClearUserCache(portalId, user.Username);
             UpdateUser(portalId, GetUserById(portalId, user.UserID));
             return retValue;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Updates a User.
+        /// Updates a user and logs the action.
         /// </summary>
-        /// <param name="portalId">The Id of the Portal.</param>
+        /// <param name="portalId">The id of the site (portal) on which to update the user.</param>
         /// <param name="user">The use to update.</param>
-        /// <remarks>
-        /// </remarks>
-        /// -----------------------------------------------------------------------------
         public static void UpdateUser(int portalId, UserInfo user)
         {
             UpdateUser(portalId, user, true);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        ///   updates a user.
+        /// Updates a user.
         /// </summary>
-        /// <param name = "portalId">the portalid of the user.</param>
-        /// <param name = "user">the user object.</param>
-        /// <param name = "loggedAction">whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
-        /// <remarks>
-        /// </remarks>
+        /// <param name="portalId">The portalid of the user to update.</param>
+        /// <param name="user">The user to update.</param>
+        /// <param name="loggedAction">A value indicating whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
         public static void UpdateUser(int portalId, UserInfo user, bool loggedAction)
         {
             UpdateUser(portalId, user, loggedAction, true);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        ///   updates a user.
+        /// Updates a user.
         /// </summary>
-        /// <param name = "portalId">the portalid of the user.</param>
-        /// <param name = "user">the user object.</param>
-        /// <param name = "loggedAction">whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <param name="user">The user object.</param>
+        /// <param name="loggedAction">Whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
         /// <param name="sendNotification">Whether to send notification to the user about the update (i.e. a notification if the user was approved).</param>
-        /// <remarks>
-        /// </remarks>
         public static void UpdateUser(int portalId, UserInfo user, bool loggedAction, bool sendNotification)
         {
             UpdateUser(portalId, user, loggedAction, sendNotification, true);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Validates a User's credentials against the Data Store, and sets the Forms Authentication
-        /// Ticket.
+        /// Validates a User's credentials against the Data Store, and sets the Forms Authentication Ticket.
         /// </summary>
-        /// <param name="portalId">The Id of the Portal the user belongs to.</param>
+        /// <param name="portalId">The id of the site (portal) the user belongs to.</param>
         /// <param name="username">The user name of the User attempting to log in.</param>
         /// <param name="password">The password of the User attempting to log in.</param>
-        /// <param name="verificationCode">The verification code of the User attempting to log in.</param>
-        /// <param name="portalName">The name of the Portal.</param>
+        /// <param name="verificationCode">The verification code of the user attempting to log in.</param>
+        /// <param name="portalName">The name of the site (portal).</param>
         /// <param name="ip">The IP Address of the user attempting to log in.</param>
-        /// <param name="loginStatus">A UserLoginStatus enumeration that indicates the status of the
-        /// Login attempt.  This value is returned by reference.</param>
+        /// <param name="loginStatus">A <see cref="UserLoginStatus"/> enumeration that indicates the status of the
+        /// Login attempt. This value is returned by reference.</param>
         /// <param name="createPersistentCookie">A flag that indicates whether the login credentials
         /// should be persisted.</param>
-        /// <returns>The UserInfo object representing a successful login.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <returns>The <see cref="UserInfo"/> object representing a successful login.</returns>
         public static UserInfo UserLogin(int portalId, string username, string password, string verificationCode, string portalName, string ip, ref UserLoginStatus loginStatus, bool createPersistentCookie)
         {
             portalId = GetEffectivePortalId(portalId);
@@ -1464,16 +1432,14 @@ public static UserInfo UserLogin(int portalId, string username, string password,
             return objUser;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Logs a Validated User in.
+        /// Logs a validated user in.
         /// </summary>
-        /// <param name="portalId">The Id of the Portal the user belongs to.</param>
-        /// <param name="user">The validated User.</param>
-        /// <param name="portalName">The name of the Portal.</param>
+        /// <param name="portalId">The id of the portal the user belongs to.</param>
+        /// <param name="user">The validated user.</param>
+        /// <param name="portalName">The name of the site (portal).</param>
         /// <param name="ip">The IP Address of the user attempting to log in.</param>
-        /// <param name="createPersistentCookie">A flag that indicates whether the login credentials should be persisted.</param>
-        /// -----------------------------------------------------------------------------
+        /// <param name="createPersistentCookie">A value indication whether the login credentials should be persisted.</param>
         public static void UserLogin(int portalId, UserInfo user, string portalName, string ip, bool createPersistentCookie)
         {
             portalId = GetEffectivePortalId(portalId);
@@ -1494,13 +1460,11 @@ public static void UserLogin(int portalId, UserInfo user, string portalName, str
             EventManager.Instance.OnUserAuthenticated(new UserEventArgs { User = user });
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Validates a Password.
+        /// Validates a password.
         /// </summary>
-        /// <param name="password">The password to Validate.</param>
-        /// <returns>A boolean.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="password">The password to validate.</param>
+        /// <returns>A value indicating whether the password is valid.</returns>
         public static bool ValidatePassword(string password)
         {
             // Valid Length
@@ -1522,40 +1486,36 @@ public static bool ValidatePassword(string password)
             return isValid;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Validates a User's credentials against the Data Store.
+        /// Validates a user's credentials against the Data Store.
         /// </summary>
-        /// <param name="portalId">The Id of the Portal the user belongs to.</param>
-        /// <param name="username">The user name of the User attempting to log in.</param>
-        /// <param name="password">The password of the User attempting to log in.</param>
-        /// <param name="verificationCode">The verification code of the User attempting to log in.</param>
-        /// <param name="portalName">The name of the Portal.</param>
-        /// <param name="ip">The IP Address of the user attempting to log in.</param>
-        /// <param name="loginStatus">A UserLoginStatus enumeration that indicates the status of the
-        /// Login attempt.  This value is returned by reference.</param>
-        /// <returns>The UserInfo object representing a valid user.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the site (portal) the user belongs to.</param>
+        /// <param name="username">The user name of the user attempting to log in.</param>
+        /// <param name="password">The password of the user attempting to log in.</param>
+        /// <param name="verificationCode">The verification code of the user attempting to log in.</param>
+        /// <param name="portalName">The name of the portal.</param>
+        /// <param name="ip">The IP address of the user attempting to log in.</param>
+        /// <param name="loginStatus">A <see cref="UserLoginStatus"/> enumeration that indicates the status of the
+        /// Login attempt. This value is returned by reference.</param>
+        /// <returns>The <see cref="UserInfo"/> object representing a valid user.</returns>
         public static UserInfo ValidateUser(int portalId, string username, string password, string verificationCode, string portalName, string ip, ref UserLoginStatus loginStatus)
         {
             return ValidateUser(portalId, username, password, "DNN", verificationCode, portalName, ip, ref loginStatus);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Validates a User's credentials against the Data Store.
+        /// Validates a user's credentials against the Data Store.
         /// </summary>
-        /// <param name="portalId">The Id of the Portal the user belongs to.</param>
-        /// <param name="username">The user name of the User attempting to log in.</param>
+        /// <param name="portalId">The id of the site (portal) the user belongs to.</param>
+        /// <param name="username">The user name of the user attempting to log in.</param>
         /// <param name="password">The password of the User attempting to log in.</param>
-        /// <param name="authType">The type of Authentication Used.</param>
-        /// <param name="verificationCode">The verification code of the User attempting to log in.</param>
-        /// <param name="portalName">The name of the Portal.</param>
+        /// <param name="authType">The type of authentication used.</param>
+        /// <param name="verificationCode">The verification code of the user attempting to log in.</param>
+        /// <param name="portalName">The name of the site (portal).</param>
         /// <param name="ip">The IP Address of the user attempting to log in.</param>
-        /// <param name="loginStatus">A UserLoginStatus enumeration that indicates the status of the
-        /// Login attempt.  This value is returned by reference.</param>
-        /// <returns>The UserInfo object representing a valid user.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="loginStatus">A <see cref="UserLoginStatus"/> enumeration that indicates the status of the
+        /// login attempt.  This value is returned by reference.</param>
+        /// <returns>The <see cref="UserInfo"/> object representing a valid user.</returns>
         public static UserInfo ValidateUser(int portalId, string username, string password, string authType, string verificationCode, string portalName, string ip, ref UserLoginStatus loginStatus)
         {
             loginStatus = UserLoginStatus.LOGIN_FAILURE;
@@ -1581,16 +1541,14 @@ public static UserInfo ValidateUser(int portalId, string username, string passwo
             return user;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Validates a User's Password and Profile.
+        /// Validates a user's password and profile.
         /// </summary>
-        /// <remarks>This overload takes a valid User (Credentials check out) and check whether the Password and Profile need updating.</remarks>
-        /// <param name="portalId">The Id of the Portal the user belongs to.</param>
+        /// <remarks>This overload takes a valid User (credentials check out) and check whether the password and profile need updating.</remarks>
         /// <param name="objUser">The user attempting to log in.</param>
-        /// <param name="ignoreExpiring">Ingore expired user.</param>
-        /// <returns>The UserLoginStatus.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the site (portal) the user belongs to.</param>
+        /// <param name="ignoreExpiring">A value indicating whether to ingore expired user.</param>
+        /// <returns>The <see cref="UserValidStatus"/> that represents the outcome.</returns>
         public static UserValidStatus ValidateUser(UserInfo objUser, int portalId, bool ignoreExpiring)
         {
             portalId = GetEffectivePortalId(portalId);
@@ -1698,63 +1656,132 @@ public static void VerifyUser(string verificationCode)
         /// <summary>
         /// Returns a absolute URL for the user profile image while removing that of the deleted and super users.
         /// </summary>
-        /// <param name="portalId">Portal Id.</param>
-        /// <param name="user">user info.</param>
-        /// <param name="width">width in pixel.</param>
-        /// <param name="height">height in pixel.</param>
-        /// <param name="showSuperUsers">true if want show super users user profile picture, false otherwise.</param>
-        /// <returns>absolute user profile picture url.</returns>
-        /// <returns></returns>
-        public static string GetProfileAvatarAbsoluteUrl(int portalId, UserInfo user, int width = 64,
-            int height = 64, bool showSuperUsers = true)
+        /// <param name="portalId">The site (portal) id.</param>
+        /// <param name="user">The user to get the profile image from.</param>
+        /// <param name="width">Width in pixels.</param>
+        /// <param name="height">Height in pixels.</param>
+        /// <param name="showSuperUsers">A value indicating whether to get the profile picture for SuperUsers (Hosts).</param>
+        /// <returns>Absolute user profile picture url.</returns>
+        /// <returns>A string containing the profile picture absolute url.</returns>
+        public static string GetProfileAvatarAbsoluteUrl(
+            int portalId,
+            UserInfo user,
+            int width = 64,
+            int height = 64,
+            bool showSuperUsers = true)
         {
             var userId = user != null && user.UserID > 0 && !user.IsDeleted && (showSuperUsers || !user.IsSuperUser) ? user.UserID : 0;
             var relativePath = Instance.GetUserProfilePictureUrl(portalId, userId, width, height);
             return GetAbsoluteUrl(portalId, relativePath);
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// GetUser retrieves a User from the DataStore.
+        /// Gets a user from the DataStore.
         /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="portalId">The Id of the Portal.</param>
-        /// <param name="userId">The Id of the user being retrieved from the Data Store.</param>
-        /// <returns>The User as a UserInfo object.</returns>
-        /// -----------------------------------------------------------------------------
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <param name="userId">The id of the user being retrieved from the Data Store.</param>
+        /// <returns>The user as a <see cref="UserInfo"/> object.</returns>
         public UserInfo GetUser(int portalId, int userId)
         {
             return GetUserById(portalId, userId);
         }
 
+        /// <summary>
+        /// Gets a user by it's display name.
+        /// </summary>
+        /// <param name="portalId">The id of the site (portal).</param>
+        /// <param name="displayName">The display name to search.</param>
+        /// <returns>A user as a <see cref="UserInfo"/> object.</returns>
+        /// <remarks>
+        /// This method will return the first match, unless the settings require unique display names,
+        /// this method may return any user that matches that display name.
+        /// </remarks>
         public UserInfo GetUserByDisplayname(int portalId, string displayName)
         {
             return MembershipProvider.Instance().GetUserByDisplayName(PortalController.GetEffectivePortalId(portalId), displayName);
         }
 
-        public IList<UserInfo> GetUsersAdvancedSearch(int portalId, int userId, int filterUserId, int filterRoleId, int relationTypeId,
-            bool isAdmin, int pageIndex, int pageSize, string sortColumn, bool sortAscending, string propertyNames,
+        /// <summary>
+        /// Provides advanced paged search functionality for users.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id to search in.</param>
+        /// <param name="userId">The requesting user id (for view permissions of the search).</param>
+        /// <param name="filterUserId">The user id for filtering relationships on, use <see cref="Null.NullInteger"/> to not use this filter.</param>
+        /// <param name="filterRoleId">The role id to filter on, use <see cref="Null.NullInteger"/> to not use this filter.</param>
+        /// <param name="relationTypeId">The relationship type id to filter on, use <see cref="Null.NullInteger"/> to not use this filter.</param>
+        /// <param name="isAdmin">A value indicating whether the requesting user is an administrator.</param>
+        /// <param name="pageIndex">The page to return.</param>
+        /// <param name="pageSize">The size of each page.</param>
+        /// <param name="sortColumn">The name of the column to sort on.</param>
+        /// <param name="sortAscending">A value indicating whether to sort ascending, will sort descending if false.</param>
+        /// <param name="propertyNames">A comma separated list of property names on which to search.</param>
+        /// <param name="propertyValues">A comma separated list of property values to search.</param>
+        /// <returns>An IList of <see cref="UserInfo"/> containing the search results.</returns>
+        public IList<UserInfo> GetUsersAdvancedSearch(
+            int portalId,
+            int userId,
+            int filterUserId,
+            int filterRoleId,
+            int relationTypeId,
+            bool isAdmin,
+            int pageIndex,
+            int pageSize,
+            string sortColumn,
+            bool sortAscending,
+            string propertyNames,
             string propertyValues)
         {
-            return MembershipProvider.Instance().GetUsersAdvancedSearch(PortalController.GetEffectivePortalId(portalId), userId, filterUserId, filterRoleId, relationTypeId,
-                                                      isAdmin, pageIndex, pageSize, sortColumn,
-                                                      sortAscending, propertyNames, propertyValues);
-        }
-
-        public IList<UserInfo> GetUsersBasicSearch(int portalId, int pageIndex, int pageSize, string sortColumn, bool sortAscending,
-            string propertyName, string propertyValue)
-        {
-            return MembershipProvider.Instance().GetUsersBasicSearch(PortalController.GetEffectivePortalId(portalId), pageIndex, pageSize, sortColumn,
-                                                       sortAscending, propertyName, propertyValue);
-        }
-
-        /// <summary>
-        /// Return User Profile Picture relative Url.
-        /// </summary>
-        /// <param name="userId">User Id.</param>
-        /// <param name="width">Width in pixel.</param>
-        /// <param name="height">Height in pixel.</param>
+            return MembershipProvider.Instance().GetUsersAdvancedSearch(
+                PortalController.GetEffectivePortalId(portalId),
+                userId,
+                filterUserId,
+                filterRoleId,
+                relationTypeId,
+                isAdmin,
+                pageIndex,
+                pageSize,
+                sortColumn,
+                sortAscending,
+                propertyNames,
+                propertyValues);
+        }
+
+        /// <summary>
+        /// Provides basic paged search functionality for users.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id on which to perform the user search.</param>
+        /// <param name="pageIndex">the page to get.</param>
+        /// <param name="pageSize">the size of each page.</param>
+        /// <param name="sortColumn">The name of the column to sort by.</param>
+        /// <param name="sortAscending">A value indicating whether to sort ascending, will sort descending if false.</param>
+        /// <param name="propertyName">The property name on which to filter by.</param>
+        /// <param name="propertyValue">The property value to filter the column by.</param>
+        /// <returns>An IList of <see cref="UserInfo"/> representing the found users.</returns>
+        public IList<UserInfo> GetUsersBasicSearch(
+            int portalId,
+            int pageIndex,
+            int pageSize,
+            string sortColumn,
+            bool sortAscending,
+            string propertyName,
+            string propertyValue)
+        {
+            return MembershipProvider.Instance().GetUsersBasicSearch(
+                PortalController.GetEffectivePortalId(portalId),
+                pageIndex,
+                pageSize,
+                sortColumn,
+                sortAscending,
+                propertyName,
+                propertyValue);
+        }
+
+        /// <summary>
+        /// Gets the user profile picture relative Url.
+        /// </summary>
+        /// <param name="userId">The id of the users to get the profile picture from.</param>
+        /// <param name="width">Width in pixels.</param>
+        /// <param name="height">Height in pixels.</param>
         /// <returns>Relative url,  e.g. /DnnImageHandler.ashx?userid=1&amp;h=32&amp;w=32 considering child portal.</returns>
         /// <remarks>Usage: ascx - &lt;asp:Image ID="avatar" runat="server" CssClass="SkinObject" /&gt;
         /// code behind - avatar.ImageUrl = UserController.Instance.GetUserProfilePictureUrl(userInfo.UserID, 32, 32).
@@ -1771,12 +1798,19 @@ public string GetUserProfilePictureUrl(int userId, int width, int height)
                 : Globals.ApplicationPath + childPortalAlias + url + cdv;
         }
 
+        /// <summary>
+        /// Checks if a username is valid.
+        /// </summary>
+        /// <param name="userName">The username to check.</param>
+        /// <remarks>
+        /// Validate username against bad characters; it must not start or end with space,
+        /// must not contain control characters, and not contain special punctuations
+        /// Printable ASCII: " !\"#$%&amp;'()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+        /// Fallback to default if there is no host setting configured.
+        /// </remarks>
+        /// <returns>A value indicating whether the username is valid.</returns>
         public bool IsValidUserName(string userName)
         {
-            // Validate username against bad characters; it must not start or end with space,
-            // must not contain control characters, and not contain special punctuations
-            // Printable ASCII: " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-            // Fallback to default if there is no host setting configured
             char[] unallowedAscii = HostController.Instance.GetString("UsernameUnallowedCharacters", Globals.USERNAME_UNALLOWED_ASCII).ToCharArray();
             return userName.Length >= 5 &&
                         userName == userName.Trim() &&
@@ -1784,6 +1818,14 @@ public bool IsValidUserName(string userName)
                         userName.IndexOfAny(unallowedAscii) < 0;
         }
 
+        /// <summary>
+        /// Gets the user profile picture url.
+        /// </summary>
+        /// <param name="portalId">The portal id the user belongs to.</param>
+        /// <param name="userId">The id if the user to get the profile picture from.</param>
+        /// <param name="width">The width in pixels of the picture.</param>
+        /// <param name="height">The height in pixels of the picture.</param>
+        /// <returns>A url to the profile picture for the user.</returns>
         public string GetUserProfilePictureUrl(int portalId, int userId, int width, int height)
         {
             var url = $"/DnnImageHandler.ashx?mode=profilepic&userId={userId}&h={width}&w={height}";
@@ -1796,11 +1838,9 @@ public string GetUserProfilePictureUrl(int portalId, int userId, int width, int
                 : Globals.ApplicationPath + childPortalAlias + url + cdv;
         }
 
-        /// -----------------------------------------------------------------------------
         /// <summary>
-        /// Update all the Users Display Names.
+        /// Update all the users display names.
         /// </summary>
-        /// -----------------------------------------------------------------------------
         public void UpdateDisplayNames()
         {
             int portalId = GetEffectivePortalId(this.PortalId);
@@ -1813,6 +1853,32 @@ public void UpdateDisplayNames()
             }
         }
 
+        /// <summary>
+        /// Gets the current user information.
+        /// </summary>
+        /// <returns>The user information in a <see cref="UserInfo"/> object.</returns>
+        UserInfo IUserController.GetCurrentUserInfo()
+        {
+            return GetCurrentUserInternal();
+        }
+
+        /// <summary>
+        /// Gets a user by it's user id.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id of the user.</param>
+        /// <param name="userId">The user id of the user.</param>
+        /// <returns>The user information in a <see cref="UserInfo"/> object.</returns>
+        UserInfo IUserController.GetUserById(int portalId, int userId)
+        {
+            return GetUserById(portalId, userId);
+        }
+
+        /// <summary>
+        /// Gets a list of user related portal settings.
+        /// </summary>
+        /// <param name="portalId">The site (portal) id from which to get the settings from.</param>
+        /// <param name="settings">The list of settings to filter from.</param>
+        /// <returns>A Hashtable of the user related portal settings.</returns>
         internal static Hashtable GetUserSettings(int portalId, Hashtable settings)
         {
             portalId = GetEffectivePortalId(portalId);
@@ -2033,9 +2099,9 @@ internal static Hashtable GetUserSettings(int portalId, Hashtable settings)
         /// <summary>
         ///   updates a user.
         /// </summary>
-        /// <param name = "portalId">the portalid of the user.</param>
-        /// <param name = "user">the user object.</param>
-        /// <param name = "loggedAction">whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
+        /// <param name="portalId">the portalid of the user.</param>
+        /// <param name="user">the user object.</param>
+        /// <param name="loggedAction">whether or not the update calls the eventlog - the eventlogtype must still be enabled for logging to occur.</param>
         /// <param name="sendNotification">Whether to send notification to the user about the update (i.e. a notification if the user was approved).</param>
         /// <param name="clearCache">Whether clear cache after update user.</param>
         /// <remarks>
@@ -2057,10 +2123,10 @@ internal static void UpdateUser(int portalId, UserInfo user, bool loggedAction,
             if (loggedAction)
             {
                 // if the httpcontext is null, then get portal settings by portal id.
-                PortalSettings portalSettings = null;
+                IPortalSettings portalSettings = null;
                 if (HttpContext.Current != null)
                 {
-                    portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+                    portalSettings = PortalController.Instance.GetCurrentSettings();
                 }
                 else if (portalId > Null.NullInteger)
                 {
@@ -2090,11 +2156,22 @@ internal static void UpdateUser(int portalId, UserInfo user, bool loggedAction,
             EventManager.Instance.OnUserApproved(new UserEventArgs { User = user });
         }
 
+        /// <summary>
+        /// Gets a new <see cref="UserController"/> instance.
+        /// </summary>
+        /// <returns>A new instance of the <see cref="UserController"/> class.</returns>
         protected override Func<IUserController> GetFactory()
         {
             return () => new UserController();
         }
 
+        private static void ClearPortalAndUserCache(UserInfo user, int portalId)
+        {
+            DeleteUserFolder(user, portalId);
+            DataCache.ClearPortalCache(portalId, false);
+            DataCache.ClearUserCache(portalId, user.Username);
+        }
+
         private static void AddEventLog(int portalId, string username, int userId, string portalName, string ip, UserLoginStatus loginStatus)
         {
             // initialize log record
@@ -2218,7 +2295,7 @@ private static UserInfo GetCurrentUserInternal()
                     return new UserInfo();
                 }
 
-                var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+                var portalSettings = PortalController.Instance.GetCurrentSettings();
                 if (portalSettings != null)
                 {
                     user = GetCachedUser(portalSettings.PortalId, Thread.CurrentPrincipal.Identity.Name);
@@ -2250,8 +2327,12 @@ private static SharedDictionary<int, string> GetUserLookupDictionary(int portalI
             var masterPortalId = GetEffectivePortalId(portalId);
             var cacheKey = string.Format(DataCache.UserLookupCacheKey, masterPortalId);
             return CBO.GetCachedObject<SharedDictionary<int, string>>(
-                new CacheItemArgs(cacheKey, DataCache.UserLookupCacheTimeOut,
-                                                            DataCache.UserLookupCachePriority), (c) => new SharedDictionary<int, string>(), true);
+                new CacheItemArgs(
+                    cacheKey,
+                    DataCache.UserLookupCacheTimeOut,
+                    DataCache.UserLookupCachePriority),
+                (c) => new SharedDictionary<int, string>(),
+                true);
         }
 
         private static bool IsMemberOfPortalGroup(int portalId)
@@ -2331,7 +2412,7 @@ private static string GetChildPortalAlias()
 
         private static string GetProfilePictureCdv(int userId)
         {
-            var settings = PortalController.Instance.GetCurrentPortalSettings();
+            var settings = PortalController.Instance.GetCurrentSettings();
             var userInfo = GetUserById(settings.PortalId, userId);
             if (userInfo?.Profile == null)
             {
@@ -2383,10 +2464,11 @@ private static string GetProfilePictureCdv(int portalId, int userId)
         /// </summary>
         /// <param name="user">The user for whom to delete the folder.
         /// Note the PortalID is taken to specify which portal to delete the folder from.</param>
-        private static void DeleteUserFolder(UserInfo user)
+        /// <param name="portalId">The portal id that contains the user folder to delete.</param>
+        private static void DeleteUserFolder(UserInfo user, int portalId)
         {
             var userFolderPath = ((PathUtils)PathUtils.Instance).GetUserFolderPathInternal(user);
-            var folderPortalId = user.IsSuperUser ? Null.NullInteger : user.PortalID;
+            var folderPortalId = user.IsSuperUser ? Null.NullInteger : portalId;
             var userFolder = FolderManager.Instance.GetFolder(folderPortalId, userFolderPath);
             if (userFolder != null)
             {
@@ -2451,15 +2533,5 @@ private static UserInfo GetUserByMembershipUserKey(int portalId, string membersh
             FixMemberPortalId(user, portalId);
             return user;
         }
-
-        UserInfo IUserController.GetCurrentUserInfo()
-        {
-            return GetCurrentUserInternal();
-        }
-
-        UserInfo IUserController.GetUserById(int portalId, int userId)
-        {
-            return GetUserById(portalId, userId);
-        }
     }
 }
diff --git a/DNN Platform/Library/Obsolete/HostController.cs b/DNN Platform/Library/Obsolete/HostController.cs
new file mode 100644
index 00000000000..1c23d977c0f
--- /dev/null
+++ b/DNN Platform/Library/Obsolete/HostController.cs	
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Entities.Controllers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.ComponentModel;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    // None of the APIs are deprecated, but the IHostController
+    // is deprecated and moved to the abstractions project. When
+    // it is time to remove APIs we should remove the parent
+    // classes listed here
+
+    /// <inheritdoc />
+    public partial class HostController : ComponentBase<IHostController, HostController>, IHostController
+    {
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.IHostSettingsService instead.")]
+        public static new IHostController Instance
+        {
+            get
+            {
+                var newHostController = Globals.DependencyProvider.GetRequiredService<IHostSettingsService>();
+                return newHostController is IHostController castedController ? castedController : new HostController();
+            }
+        }
+
+        /// <inheritdoc/>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.IHostSettingsService instead.")]
+        public Dictionary<string, ConfigurationSetting> GetSettings() =>
+            ((IHostSettingsService)this).GetSettings()
+                .Where(setting => setting.Value is ConfigurationSetting)
+                .Select(setting => new KeyValuePair<string, ConfigurationSetting>(setting.Key, (ConfigurationSetting)setting.Value))
+                .ToDictionary(setting => setting.Key, setting => setting.Value);
+
+        /// <inheritdoc/>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.IHostSettingsService instead.")]
+        public void Update(ConfigurationSetting config) =>
+            ((IHostSettingsService)this).Update(config);
+
+        /// <inheritdoc/>
+        [Obsolete("Deprecated in 9.7.1. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.IHostSettingsService instead.")]
+        public void Update(ConfigurationSetting config, bool clearCache) =>
+            ((IHostSettingsService)this).Update(config, clearCache);
+    }
+}
diff --git a/DNN Platform/Library/Obsolete/PortalAliasController.cs b/DNN Platform/Library/Obsolete/PortalAliasController.cs
index 2ba9318334f..542109ffa1a 100644
--- a/DNN Platform/Library/Obsolete/PortalAliasController.cs	
+++ b/DNN Platform/Library/Obsolete/PortalAliasController.cs	
@@ -3,90 +3,198 @@
 // See the LICENSE file in the project root for more information
 
 // ReSharper disable once CheckNamespace
-namespace DotNetNuke.Entities.Portals
-{
-    using System;
-    using System.Collections;
+namespace DotNetNuke.Entities.Portals
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
     using System.ComponentModel;
-    using System.Linq;
+    using System.Linq;
 
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Framework;
     using DotNetNuke.Services.Log.EventLog;
 
-    public partial class PortalAliasController
-    {
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.3.  Replaced by PortalAliasController.Instance.GetPortalAlias. Scheduled removal in v10.0.0.")]
-        public static PortalAliasInfo GetPortalAliasInfo(string httpAlias)
-        {
-            return Instance.GetPortalAlias(httpAlias);
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliases. Scheduled removal in v10.0.0.")]
-        public static PortalAliasCollection GetPortalAliasLookup()
-        {
-            var portalAliasCollection = new PortalAliasCollection();
-            var aliasController = new PortalAliasController();
-            foreach (var kvp in aliasController.GetPortalAliasesInternal())
-            {
-                portalAliasCollection.Add(kvp.Key, kvp.Value);
-            }
-
-            return portalAliasCollection;
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.3.  Replaced by PortalAliasController.Instance.GetPortalAlias. Scheduled removal in v10.0.0.")]
-        public static PortalAliasInfo GetPortalAliasLookup(string httpAlias)
-        {
-            return Instance.GetPortalAlias(httpAlias);
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.DeletePortalAlias. Scheduled removal in v10.0.0.")]
-        public void DeletePortalAlias(int portalAliasId)
-        {
-            DataProvider.Instance().DeletePortalAlias(portalAliasId);
-
-            EventLogController.Instance.AddLog(
-                "PortalAliasID",
-                portalAliasId.ToString(),
-                PortalController.Instance.GetCurrentPortalSettings(),
-                UserController.Instance.GetCurrentUserInfo().UserID,
-                EventLogController.EventLogType.PORTALALIAS_DELETED);
-
-            DataCache.RemoveCache(DataCache.PortalAliasCacheKey);
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliasesByPortalId. Scheduled removal in v10.0.0.")]
-        public ArrayList GetPortalAliasArrayByPortalID(int PortalID)
-        {
-            return new ArrayList(Instance.GetPortalAliasesByPortalId(PortalID).ToArray());
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliasesByPortalId. Scheduled removal in v10.0.0.")]
-        public PortalAliasCollection GetPortalAliasByPortalID(int PortalID)
-        {
-            var portalAliasCollection = new PortalAliasCollection();
-
-            foreach (PortalAliasInfo alias in GetPortalAliasLookup().Values.Cast<PortalAliasInfo>().Where(alias => alias.PortalID == PortalID))
-            {
-                portalAliasCollection.Add(alias.HTTPAlias, alias);
-            }
-
-            return portalAliasCollection;
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.UpdatePortalAlias. Scheduled removal in v10.0.0.")]
-        public void UpdatePortalAliasInfo(PortalAliasInfo portalAlias)
-        {
-            Instance.UpdatePortalAlias(portalAlias);
-        }
-    }
-}
+    using Microsoft.Extensions.DependencyInjection;
+
+    public partial class PortalAliasController : ServiceLocator<IPortalAliasController, PortalAliasController>, IPortalAliasController
+    {
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+
+        public static new IPortalAliasController Instance
+        {
+            get
+            {
+                var portalAliasSettingsService = Globals.DependencyProvider.GetRequiredService<IPortalAliasService>();
+                return portalAliasSettingsService is IPortalAliasController castedController ? castedController : new PortalAliasController();
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.3.  Replaced by PortalAliasController.Instance.GetPortalAlias. Scheduled removal in v10.0.0.")]
+        public static PortalAliasInfo GetPortalAliasInfo(string httpAlias)
+        {
+            return Instance.GetPortalAlias(httpAlias);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliases. Scheduled removal in v10.0.0.")]
+        public static PortalAliasCollection GetPortalAliasLookup()
+        {
+            var portalAliasCollection = new PortalAliasCollection();
+            var aliasController = new PortalAliasController();
+            foreach (var kvp in aliasController.GetPortalAliasesInternal())
+            {
+                portalAliasCollection.Add(kvp.Key, kvp.Value);
+            }
+
+            return portalAliasCollection;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.3.  Replaced by PortalAliasController.Instance.GetPortalAlias. Scheduled removal in v10.0.0.")]
+        public static PortalAliasInfo GetPortalAliasLookup(string httpAlias)
+        {
+            return Instance.GetPortalAlias(httpAlias);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.DeletePortalAlias. Scheduled removal in v10.0.0.")]
+        public void DeletePortalAlias(int portalAliasId)
+        {
+            DataProvider.Instance().DeletePortalAlias(portalAliasId);
+
+            EventLogController.Instance.AddLog(
+                "PortalAliasID",
+                portalAliasId.ToString(),
+                PortalController.Instance.GetCurrentPortalSettings(),
+                UserController.Instance.GetCurrentUserInfo().UserID,
+                EventLogController.EventLogType.PORTALALIAS_DELETED);
+
+            DataCache.RemoveCache(DataCache.PortalAliasCacheKey);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliasesByPortalId. Scheduled removal in v10.0.0.")]
+        public ArrayList GetPortalAliasArrayByPortalID(int PortalID)
+        {
+            return new ArrayList(Instance.GetPortalAliasesByPortalId(PortalID).ToArray());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.GetPortalAliasesByPortalId. Scheduled removal in v10.0.0.")]
+        public PortalAliasCollection GetPortalAliasByPortalID(int PortalID)
+        {
+            var portalAliasCollection = new PortalAliasCollection();
+
+            foreach (PortalAliasInfo alias in GetPortalAliasLookup().Values.Cast<PortalAliasInfo>().Where(alias => alias.PortalID == PortalID))
+            {
+                portalAliasCollection.Add(alias.HTTPAlias, alias);
+            }
+
+            return portalAliasCollection;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Deprecated in version 7.1.  Replaced by PortalAliasController.Instance.UpdatePortalAlias. Scheduled removal in v10.0.0.")]
+        public void UpdatePortalAliasInfo(PortalAliasInfo portalAlias)
+        {
+            Instance.UpdatePortalAlias(portalAlias);
+        }
+
+        /// <summary>
+        /// Gets the portal alias by portal.
+        /// </summary>
+        /// <param name="portalId">The portal id.</param>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <returns>Portal alias.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public static string GetPortalAliasByPortal(int portalId, string portalAlias) =>
+            ((IPortalAliasService)Instance).GetPortalAliasByPortal(portalId, portalAlias);
+
+        /// <summary>
+        /// Gets the portal alias by tab.
+        /// </summary>
+        /// <param name="tabId">The tab ID.</param>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <returns>Portal alias.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public static string GetPortalAliasByTab(int tabId, string portalAlias) =>
+            ((IPortalAliasService)Instance).GetPortalAliasByTab(tabId, portalAlias);
+
+        /// <summary>
+        /// Validates the alias.
+        /// </summary>
+        /// <param name="portalAlias">The portal alias.</param>
+        /// <param name="ischild">if set to <c>true</c> [ischild].</param>
+        /// <returns><c>true</c> if the alias is a valid url format; otherwise return <c>false</c>.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public static bool ValidateAlias(string portalAlias, bool ischild) =>
+            ((IPortalAliasService)Instance).ValidateAlias(portalAlias, ischild);
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public int AddPortalAlias(PortalAliasInfo portalAlias) =>
+            ((IPortalAliasService)this).AddPortalAlias(portalAlias);
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public void DeletePortalAlias(PortalAliasInfo portalAlias) =>
+            ((IPortalAliasService)this).DeletePortalAlias(portalAlias);
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public PortalAliasInfo GetPortalAlias(string alias) =>
+            (PortalAliasInfo)((IPortalAliasService)this).GetPortalAlias(alias);
+
+        /// <summary>
+        /// Gets the portal alias.
+        /// </summary>
+        /// <param name="alias">The portal alias.</param>
+        /// <param name="portalId">The portal ID.</param>
+        /// <returns>Portal Alias Info.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public PortalAliasInfo GetPortalAlias(string alias, int portalId) =>
+            (PortalAliasInfo)((IPortalAliasService)this).GetPortalAlias(alias, portalId);
+
+        /// <summary>
+        /// Gets the portal alias by portal alias ID.
+        /// </summary>
+        /// <param name="portalAliasId">The portal alias ID.</param>
+        /// <returns>Portal alias info.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public PortalAliasInfo GetPortalAliasByPortalAliasID(int portalAliasId) =>
+            (PortalAliasInfo)((IPortalAliasService)this).GetPortalAliasByPortalAliasId(portalAliasId);
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public PortalAliasCollection GetPortalAliases()
+        {
+            var aliasCollection = new PortalAliasCollection();
+            foreach (var alias in this.GetPortalAliasesInternal().Values)
+            {
+                aliasCollection.Add(alias.HTTPAlias, alias);
+            }
+
+            return aliasCollection;
+        }
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public IEnumerable<PortalAliasInfo> GetPortalAliasesByPortalId(int portalId) =>
+            ((IPortalAliasService)this).GetPortalAliasesByPortalId(portalId)
+                .Cast<PortalAliasInfo>();
+
+        /// <summary>
+        /// Gets the portal by portal alias ID.
+        /// </summary>
+        /// <param name="PortalAliasId">The portal alias id.</param>
+        /// <returns>Portal info.</returns>
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public PortalInfo GetPortalByPortalAliasID(int PortalAliasId) =>
+            (PortalInfo)((IPortalAliasService)this).GetPortalByPortalAliasId(PortalAliasId);
+
+        [Obsolete("Deprecated in 9.7.2. Scheduled for removal in v11.0.0, use DotNetNuke.Abstractions.Portals.IPortalAliasService via dependency injection instead.")]
+        public void UpdatePortalAlias(PortalAliasInfo portalAlias) =>
+            ((IPortalAliasService)this).UpdatePortalAlias(portalAlias);
+    }
+}
diff --git a/DNN Platform/Library/Services/Tokens/TokenReplace.cs b/DNN Platform/Library/Services/Tokens/TokenReplace.cs
index ce036e67448..e13d579d985 100644
--- a/DNN Platform/Library/Services/Tokens/TokenReplace.cs	
+++ b/DNN Platform/Library/Services/Tokens/TokenReplace.cs	
@@ -133,7 +133,16 @@ public int ModuleId {
             get => TokenContext.Module?.ModuleID ?? Null.NullInteger;
             set => TokenContext.Module = GetModule(value);
         }
-
+
+        /// <summary>
+        /// Load the module for the Module Token Provider
+        /// </summary>
+        /// <param name="moduleId"></param>
+        /// <returns>The populated ModuleInfo or null</returns>
+        /// <remarks>
+        /// This method is called by the Setter of ModuleId.
+        /// Because of this, it may NOT access ModuleId itself (which will still be -1) but use moduleId (lower case)
+        /// </remarks>
         private ModuleInfo GetModule(int moduleId)
         {
             if (moduleId == TokenContext.Module?.ModuleID)
@@ -144,9 +153,9 @@ private ModuleInfo GetModule(int moduleId)
 
             var tab = TokenContext.Tab ?? PortalSettings?.ActiveTab;
             if (tab != null && tab.TabID > 0)
-                return ModuleController.Instance.GetModule(ModuleId, tab.TabID, false);
+                return ModuleController.Instance.GetModule(moduleId, tab.TabID, false);
 
-            return ModuleController.Instance.GetModule(ModuleId, Null.NullInteger, true);
+            return ModuleController.Instance.GetModule(moduleId, Null.NullInteger, true);
         }
 
         /// <summary>
diff --git a/DNN Platform/Library/Startup.cs b/DNN Platform/Library/Startup.cs
index a56986c5434..3c9bb21b224 100644
--- a/DNN Platform/Library/Startup.cs	
+++ b/DNN Platform/Library/Startup.cs	
@@ -6,12 +6,15 @@ namespace DotNetNuke
 {
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Abstractions.Portals;
     using DotNetNuke.Application;
     using DotNetNuke.Common;
     using DotNetNuke.DependencyInjection;
+    using DotNetNuke.Entities.Controllers;
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.UI.Modules;
     using DotNetNuke.UI.Modules.Html5;
+
     using Microsoft.Extensions.DependencyInjection;
 
     /// <inheritdoc />
@@ -26,10 +29,13 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IDnnContext, DotNetNukeContext>();
 
             services.AddTransient(x => PortalController.Instance);
+            services.AddScoped<IHostSettingsService, HostController>();
             services.AddScoped<INavigationManager, NavigationManager>();
 
             services.AddScoped<IApplicationInfo, Application.Application>();
             services.AddScoped<IApplicationStatusInfo, ApplicationStatusInfo>();
+
+            services.AddScoped<IPortalAliasService, PortalAliasController>();
         }
     }
 }
diff --git a/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs b/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs
index d75a662e154..09f3558ed04 100644
--- a/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs	
+++ b/DNN Platform/Modules/DnnExportImport/Components/Services/PagesExportService.cs	
@@ -220,6 +220,7 @@ protected virtual void ProcessImportPage(ExportTab otherTab, IList<ExportTab> ex
 
                         // this is not saved when adding the tab; so set it explicitly
                         localTab.IsVisible = otherTab.IsVisible;
+                        localTab.IsDeleted = otherTab.IsDeleted;
                         EntitiesController.Instance.SetTabSpecificData(localTab.TabID, false, localTab.IsVisible);
 
                         // Try to set the unique id of existing page same as source page unique id, if possible. This will help for future updates etc.
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/AttachmentControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/AttachmentControllerTests.cs
index 1e2f7f3bc49..3115e60032b 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/AttachmentControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/AttachmentControllerTests.cs	
@@ -2,303 +2,306 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System.Collections.Generic;
+namespace DotNetNuke.Tests.Content
+{
+    using System.Collections.Generic;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Entities.Content;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.FileSystem;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Entities.Content;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.FileSystem;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    using FileController = DotNetNuke.Entities.Content.AttachmentController;
-    using Util = DotNetNuke.Entities.Content.Common.Util;
-
-    [TestFixture]
-    public class AttachmentControllerTests
-    {
-        private Mock<CachingProvider> mockCache;
-
-        [SetUp]
-        public void SetUp()
-        {
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using FileController = DotNetNuke.Entities.Content.AttachmentController;
+    using Util = DotNetNuke.Entities.Content.Common.Util;
+
+    [TestFixture]
+    public class AttachmentControllerTests
+    {
+        private Mock<CachingProvider> mockCache;
+
+        [SetUp]
+        public void SetUp()
+        {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            // Register MockCachingProvider
-            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void Test_Add_File_To_Content_Item_Without_Metadata()
-        {
-            var dataService = DataServiceFactory();
-
-            dataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>()))
-                .Returns(Constants.CONTENT_AddContentItemId);
-
-            // Return empty set of metadata.
-            dataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateEmptyMetaDataReader);
-
-            var content = ContentTestHelper.CreateValidContentItem();
-            content.Metadata.Clear();
-
-            var contentId = Util.GetContentController().AddContentItem(content);
-            Assert.AreEqual(contentId, Constants.CONTENT_AddContentItemId);
-            Assert.IsEmpty(content.Metadata);
-
-            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>()))
-                .Returns<int>(y => MockHelper.CreateValidContentItemReader(content));
-
-            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
-
-            fileController.AddFileToContent(contentId, ContentTestHelper.CreateValidFile(0));
-
-            dataService.Verify(
-                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, new[] { 0 }.ToJson()));
-        }
-
-        [Test]
-        public void Test_Load_Attachments_From_DataService()
-        {
-            var files = new List<IFileInfo>
-                {
-                    ContentTestHelper.CreateValidFile(0),
-                    ContentTestHelper.CreateValidFile(1),
-                    ContentTestHelper.CreateValidFile(2),
-                };
-
-            var dataService = DataServiceFactory();
-
-            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
-
-            dataService.Setup(
-                ds =>
-                    ds.GetMetaData(It.IsAny<int>())).Returns(
-                        () => MockHelper.CreateMetaDataReaderWithFiles(files, new IFileInfo[0], new IFileInfo[0]));
-
-            var contentItem = Util.GetContentController().GetContentItem(Constants.CONTENT_ValidContentItemId);
-            Assert.IsNotNull(contentItem);
-
-            var serialized = contentItem.Metadata[FileController.FilesKey];
-            Assert.IsNotEmpty(serialized);
-
-            Assert.IsNotEmpty(contentItem.Files);
-            Assert.AreEqual(contentItem.Files.Count, 3);
-            Assert.AreEqual(contentItem.Files[0].FileId, 0);
-            Assert.AreEqual(contentItem.Files[1].FileId, 1);
-            Assert.AreEqual(contentItem.Files[2].FileId, 2);
-        }
-
-        [Test]
-        public void Test_Add_Attachments_With_FileController()
-        {
-            var dataService = DataServiceFactory();
-
-            dataService.Setup(
-                ds =>
-                    ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
-
-            // Use a closure to store the metadata locally in this method.
-            var data = new Dictionary<string, string>();
-
-            dataService.Setup(
-                ds =>
-                    ds.GetMetaData(It.IsAny<int>())).Returns(
-                        () => MockHelper.CreateMetaDataReaderFromDictionary(data));
-
-            dataService.Setup(
-                    ds =>
-                        ds.AddMetaData(
-                            It.IsAny<ContentItem>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>()))
-                .Callback<ContentItem, string, string>((ci, name, value) => data[name] = value);
-
-            var contentController = Util.GetContentController();
-
-            var contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
-            Assert.IsNotNull(contentItem);
-
-            var serialized = contentItem.Metadata[FileController.FilesKey];
-            Assert.IsNull(serialized);
-            Assert.IsEmpty(contentItem.Files);
-
-            var fileManager = ComponentFactory.GetComponent<IFileManager>();
-
-            // Add some files.
-            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
-            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(0));
-            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(1));
-
-            contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
-
-            Assert.AreEqual(contentItem.Files.Count, 2);
-            Assert.AreEqual(contentItem.Files[0].FileId, 0);
-            Assert.AreEqual(contentItem.Files[1].FileId, 1);
-
-            dataService.Verify(
-                ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
-
-            dataService.Verify(
-                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
-
-            dataService.Verify(
-                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
-        }
-
-        [Test]
-        public void Set_MetaData_To_Empty_Value_Deletes_Row()
-        {
-            var data = new Dictionary<string, string>();
-
-            var dataService = DataServiceFactoryWithLocalMetaData(ref data);
-
-            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
-
-            var contentController = Util.GetContentController();
-
-            var fileManager = ComponentFactory.GetComponent<IFileManager>();
-
-            var contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
-            Assert.IsNotNull(contentItem);
-
-            var serialized = contentItem.Metadata[FileController.FilesKey];
-            Assert.IsNull(serialized);
-            Assert.IsEmpty(contentItem.Files);
-
-            // Add some files.
-            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
-            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(0));
-            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(1));
-
-            contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
-
-            Assert.AreEqual(contentItem.Files.Count, 2);
-            Assert.AreEqual(contentItem.Files[0].FileId, 0);
-            Assert.AreEqual(contentItem.Files[1].FileId, 1);
-            Assert.IsNotEmpty(contentItem.Metadata[FileController.FilesKey]);
-
-            contentItem.Files.Clear();
-
-            contentController.UpdateContentItem(contentItem);
-
-            dataService.Verify(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
-            dataService.Verify(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
-            dataService.Verify(ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
-            dataService.Verify(ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
-
-            var emptyFiles = fileController.GetFilesByContent(contentItem.ContentItemId);
-            Assert.AreEqual(0, emptyFiles.Count);
-        }
-
-        /// <remarks>This test should be moved elsewhere (cb).</remarks>
-        [Test]
-        public void Set_MetaData_To_Same_Value_Doesnt_Update_Database_Entry()
-        {
-            var metadata = new Dictionary<string, string>();
-
-            var dataService = DataServiceFactoryWithLocalMetaData(ref metadata);
-
-            var contentController = Util.GetContentController();
-
-            var contentItem = ContentTestHelper.CreateValidContentItem();
-
-            contentController.AddContentItem(contentItem);
-
-            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
-            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
-
-            contentItem.ContentTitle = "Foobar";
-
-            contentController.UpdateContentItem(contentItem);
-
-            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
-            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
-
-            contentItem.ContentTitle = "Foobar";
-
-            contentController.UpdateContentItem(contentItem);
-
-            // Should be a no-op since no real data changed
-            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
-            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
-
-            // Really update
-            contentItem.ContentTitle = "SNAFU";
-
-            contentController.UpdateContentItem(contentItem);
-
-            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Exactly(2));
-            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
-        }
-
-        private static Mock<IDataService> DataServiceFactory()
-        {
-            var dataService = new Mock<IDataService>();
-
-            dataService.Setup(ds =>
-             ds.SynchronizeMetaData(
-                 It.IsAny<ContentItem>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
-             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
-                 (ci, added, deleted) =>
-                 {
-                     deleted.ToList().ForEach(
-                         item => dataService.Object.DeleteMetaData(ci, item.Key, item.Value));
-
-                     added.ToList().ForEach(
-                         item => dataService.Object.AddMetaData(ci, item.Key, item.Value));
-                 });
-
-            // Register controller types that are dependent on our IDataService.
-            var contentController = new ContentController(dataService.Object);
-
-            ComponentFactory.RegisterComponentInstance<IAttachmentController>(new FileController(contentController));
-            ComponentFactory.RegisterComponentInstance<IContentController>(contentController);
-            ComponentFactory.RegisterComponentInstance<IFileManager>(MockHelper.CreateMockFileManager().Object);
-
-            return dataService;
-        }
-
-        private static Mock<IDataService> DataServiceFactoryWithLocalMetaData(ref Dictionary<string, string> metadata)
-        {
-            var dataService = DataServiceFactory();
-
-            var closure = metadata;
-
-            dataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(() => MockHelper.CreateMetaDataReaderFromDictionary(closure));
-            dataService.Setup(ds => ds.AddMetaData(It.IsAny<ContentItem>(), It.IsAny<string>(), It.IsAny<string>())).
-                Callback<ContentItem, string, string>((ci, name, value) => closure[name] = value);
-            dataService.Setup(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), It.IsAny<string>(), It.IsAny<string>()))
-                .Callback<ContentItem, string, string>((ci, key, val) => closure.Remove(key));
-
-            return dataService;
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            // Register MockCachingProvider
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void Test_Add_File_To_Content_Item_Without_Metadata()
+        {
+            var dataService = DataServiceFactory();
+
+            dataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>()))
+                .Returns(Constants.CONTENT_AddContentItemId);
+
+            // Return empty set of metadata.
+            dataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateEmptyMetaDataReader);
+
+            var content = ContentTestHelper.CreateValidContentItem();
+            content.Metadata.Clear();
+
+            var contentId = Util.GetContentController().AddContentItem(content);
+            Assert.AreEqual(contentId, Constants.CONTENT_AddContentItemId);
+            Assert.IsEmpty(content.Metadata);
+
+            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>()))
+                .Returns<int>(y => MockHelper.CreateValidContentItemReader(content));
+
+            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
+
+            fileController.AddFileToContent(contentId, ContentTestHelper.CreateValidFile(0));
+
+            dataService.Verify(
+                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, new[] { 0 }.ToJson()));
+        }
+
+        [Test]
+        public void Test_Load_Attachments_From_DataService()
+        {
+            var files = new List<IFileInfo>
+                {
+                    ContentTestHelper.CreateValidFile(0),
+                    ContentTestHelper.CreateValidFile(1),
+                    ContentTestHelper.CreateValidFile(2),
+                };
+
+            var dataService = DataServiceFactory();
+
+            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
+
+            dataService.Setup(
+                ds =>
+                    ds.GetMetaData(It.IsAny<int>())).Returns(
+                        () => MockHelper.CreateMetaDataReaderWithFiles(files, new IFileInfo[0], new IFileInfo[0]));
+
+            var contentItem = Util.GetContentController().GetContentItem(Constants.CONTENT_ValidContentItemId);
+            Assert.IsNotNull(contentItem);
+
+            var serialized = contentItem.Metadata[FileController.FilesKey];
+            Assert.IsNotEmpty(serialized);
+
+            Assert.IsNotEmpty(contentItem.Files);
+            Assert.AreEqual(contentItem.Files.Count, 3);
+            Assert.AreEqual(contentItem.Files[0].FileId, 0);
+            Assert.AreEqual(contentItem.Files[1].FileId, 1);
+            Assert.AreEqual(contentItem.Files[2].FileId, 2);
+        }
+
+        [Test]
+        public void Test_Add_Attachments_With_FileController()
+        {
+            var dataService = DataServiceFactory();
+
+            dataService.Setup(
+                ds =>
+                    ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
+
+            // Use a closure to store the metadata locally in this method.
+            var data = new Dictionary<string, string>();
+
+            dataService.Setup(
+                ds =>
+                    ds.GetMetaData(It.IsAny<int>())).Returns(
+                        () => MockHelper.CreateMetaDataReaderFromDictionary(data));
+
+            dataService.Setup(
+                    ds =>
+                        ds.AddMetaData(
+                            It.IsAny<ContentItem>(),
+                            It.IsAny<string>(),
+                            It.IsAny<string>()))
+                .Callback<ContentItem, string, string>((ci, name, value) => data[name] = value);
+
+            var contentController = Util.GetContentController();
+
+            var contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
+            Assert.IsNotNull(contentItem);
+
+            var serialized = contentItem.Metadata[FileController.FilesKey];
+            Assert.IsNull(serialized);
+            Assert.IsEmpty(contentItem.Files);
+
+            var fileManager = ComponentFactory.GetComponent<IFileManager>();
+
+            // Add some files.
+            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
+            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(0));
+            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(1));
+
+            contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
+
+            Assert.AreEqual(contentItem.Files.Count, 2);
+            Assert.AreEqual(contentItem.Files[0].FileId, 0);
+            Assert.AreEqual(contentItem.Files[1].FileId, 1);
+
+            dataService.Verify(
+                ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
+
+            dataService.Verify(
+                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
+
+            dataService.Verify(
+                ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
+        }
+
+        [Test]
+        public void Set_MetaData_To_Empty_Value_Deletes_Row()
+        {
+            var data = new Dictionary<string, string>();
+
+            var dataService = DataServiceFactoryWithLocalMetaData(ref data);
+
+            dataService.Setup(ds => ds.GetContentItem(It.IsAny<int>())).Returns(MockHelper.CreateValidContentItemReader);
+
+            var contentController = Util.GetContentController();
+
+            var fileManager = ComponentFactory.GetComponent<IFileManager>();
+
+            var contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
+            Assert.IsNotNull(contentItem);
+
+            var serialized = contentItem.Metadata[FileController.FilesKey];
+            Assert.IsNull(serialized);
+            Assert.IsEmpty(contentItem.Files);
+
+            // Add some files.
+            var fileController = ComponentFactory.GetComponent<IAttachmentController>();
+            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(0));
+            fileController.AddFileToContent(contentItem.ContentItemId, fileManager.GetFile(1));
+
+            contentItem = contentController.GetContentItem(Constants.CONTENT_ValidContentItemId);
+
+            Assert.AreEqual(contentItem.Files.Count, 2);
+            Assert.AreEqual(contentItem.Files[0].FileId, 0);
+            Assert.AreEqual(contentItem.Files[1].FileId, 1);
+            Assert.IsNotEmpty(contentItem.Metadata[FileController.FilesKey]);
+
+            contentItem.Files.Clear();
+
+            contentController.UpdateContentItem(contentItem);
+
+            dataService.Verify(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
+            dataService.Verify(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
+            dataService.Verify(ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0]"), Times.Once());
+            dataService.Verify(ds => ds.AddMetaData(It.IsAny<ContentItem>(), FileController.FilesKey, "[0,1]"), Times.Once());
+
+            var emptyFiles = fileController.GetFilesByContent(contentItem.ContentItemId);
+            Assert.AreEqual(0, emptyFiles.Count);
+        }
+
+        /// <remarks>This test should be moved elsewhere (cb).</remarks>
+        [Test]
+        public void Set_MetaData_To_Same_Value_Doesnt_Update_Database_Entry()
+        {
+            var metadata = new Dictionary<string, string>();
+
+            var dataService = DataServiceFactoryWithLocalMetaData(ref metadata);
+
+            var contentController = Util.GetContentController();
+
+            var contentItem = ContentTestHelper.CreateValidContentItem();
+
+            contentController.AddContentItem(contentItem);
+
+            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
+            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
+
+            contentItem.ContentTitle = "Foobar";
+
+            contentController.UpdateContentItem(contentItem);
+
+            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
+            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
+
+            contentItem.ContentTitle = "Foobar";
+
+            contentController.UpdateContentItem(contentItem);
+
+            // Should be a no-op since no real data changed
+            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
+            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Never());
+
+            // Really update
+            contentItem.ContentTitle = "SNAFU";
+
+            contentController.UpdateContentItem(contentItem);
+
+            dataService.Verify(ds => ds.AddMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Exactly(2));
+            dataService.Verify(ds => ds.DeleteMetaData(contentItem, FileController.TitleKey, It.IsAny<string>()), Times.Once());
+        }
+
+        private static Mock<IDataService> DataServiceFactory()
+        {
+            var dataService = new Mock<IDataService>();
+
+            dataService.Setup(ds =>
+             ds.SynchronizeMetaData(
+                 It.IsAny<ContentItem>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
+             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
+                 (ci, added, deleted) =>
+                 {
+                     deleted.ToList().ForEach(
+                         item => dataService.Object.DeleteMetaData(ci, item.Key, item.Value));
+
+                     added.ToList().ForEach(
+                         item => dataService.Object.AddMetaData(ci, item.Key, item.Value));
+                 });
+
+            // Register controller types that are dependent on our IDataService.
+            var contentController = new ContentController(dataService.Object);
+
+            ComponentFactory.RegisterComponentInstance<IAttachmentController>(new FileController(contentController));
+            ComponentFactory.RegisterComponentInstance<IContentController>(contentController);
+            ComponentFactory.RegisterComponentInstance<IFileManager>(MockHelper.CreateMockFileManager().Object);
+
+            return dataService;
+        }
+
+        private static Mock<IDataService> DataServiceFactoryWithLocalMetaData(ref Dictionary<string, string> metadata)
+        {
+            var dataService = DataServiceFactory();
+
+            var closure = metadata;
+
+            dataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(() => MockHelper.CreateMetaDataReaderFromDictionary(closure));
+            dataService.Setup(ds => ds.AddMetaData(It.IsAny<ContentItem>(), It.IsAny<string>(), It.IsAny<string>())).
+                Callback<ContentItem, string, string>((ci, name, value) => closure[name] = value);
+            dataService.Setup(ds => ds.DeleteMetaData(It.IsAny<ContentItem>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Callback<ContentItem, string, string>((ci, key, val) => closure.Remove(key));
+
+            return dataService;
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentControllerTests.cs
index f2d3bbc3131..1dff4256244 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentControllerTests.cs	
@@ -2,704 +2,708 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
+namespace DotNetNuke.Tests.Content
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.Specialized;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Content;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Search.Entities;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Content;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Search.Entities;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for ContentItemTests.
-    /// </summary>
-    [TestFixture]
-    public class ContentControllerTests
-    {
-        private const int ModuleSearchTypeId = 1;
-
-        private Mock<CachingProvider> _mockCache;
-        private Mock<DataProvider> _mockDataProvider;
-        private Mock<Services.Search.Internals.ISearchHelper> _mockSearchHelper;
-
-        [SetUp]
-        public void SetUp()
-        {
-            this._mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            this._mockDataProvider = MockComponentProvider.CreateDataProvider();
-            this._mockSearchHelper = new Mock<Services.Search.Internals.ISearchHelper>();
-
-            Services.Search.Internals.SearchHelper.SetTestableInstance(this._mockSearchHelper.Object);
-
-            this._mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(
-                (string searchTypeName) => new SearchType { SearchTypeName = searchTypeName, SearchTypeId = ModuleSearchTypeId });
-
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for ContentItemTests.
+    /// </summary>
+    [TestFixture]
+    public class ContentControllerTests
+    {
+        private const int ModuleSearchTypeId = 1;
+
+        private Mock<CachingProvider> mockCache;
+        private Mock<DataProvider> mockDataProvider;
+        private Mock<Services.Search.Internals.ISearchHelper> mockSearchHelper;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            this.mockDataProvider = MockComponentProvider.CreateDataProvider();
+            this.mockSearchHelper = new Mock<Services.Search.Internals.ISearchHelper>();
+
+            Services.Search.Internals.SearchHelper.SetTestableInstance(this.mockSearchHelper.Object);
+
+            this.mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(
+                (string searchTypeName) => new SearchType { SearchTypeName = searchTypeName, SearchTypeId = ModuleSearchTypeId });
+
             var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
 
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void ContentController_AddContentItem_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => controller.AddContentItem(null));
-        }
-
-        [Test]
-        public void ContentController_AddContentItem_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-
-            // Act
-            int contentId = controller.AddContentItem(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddContentItem(content, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void ContentController_AddContentItem_Returns_ValidId_On_Valid_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>())).Returns(Constants.CONTENT_AddContentItemId);
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-
-            // Act
-            int contentId = controller.AddContentItem(content);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_AddContentItemId, contentId);
-        }
-
-        [Test]
-        public void ContentController_AddContentItem_Sets_ContentItemId_Property_On_Valid_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>())).Returns(Constants.CONTENT_AddContentItemId);
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-
-            // Act
-            int contentId = controller.AddContentItem(content);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_AddContentItemId, content.ContentItemId);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void ContentController_DeleteContentItem_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            controller.DeleteContentItem(null);
-        }
-
-        [Test]
-        public void ContentController_DeleteContentItem_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.DeleteContentItem(content));
-        }
-
-        [Test]
-        public void ContentController_DeleteContentItem_Calls_DataService_On_Valid_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_DeleteContentItemId;
-
-            // Act
-            controller.DeleteContentItem(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteContentItem(content.ContentItemId));
-        }
-
-        [Test]
-        public void ContentController_GetContentItem_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.GetContentItem(Null.NullInteger));
-        }
-
-        [Test]
-        public void ContentController_GetContentItem_Returns_Null_On_InValid_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_InValidContentItemId)).Returns(MockHelper.CreateEmptyContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            ContentItem content = controller.GetContentItem(Constants.CONTENT_InValidContentItemId);
-
-            // Assert
-            Assert.IsNull(content);
-        }
-
-        [Test]
-        public void ContentController_GetContentItem_Calls_DataService_On_Valid_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            ContentItem content = controller.GetContentItem(Constants.CONTENT_ValidContentItemId);
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId));
-        }
-
-        [Test]
-        public void ContentController_GetContentItem_Returns_ContentItem_On_Valid_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            ContentItem content = controller.GetContentItem(Constants.CONTENT_ValidContentItemId);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_ValidContentItemId, content.ContentItemId);
-            Assert.AreEqual(ContentTestHelper.GetContent(Constants.CONTENT_ValidContentItemId), content.Content);
-            Assert.AreEqual(ContentTestHelper.GetContentKey(Constants.CONTENT_ValidContentItemId), content.ContentKey);
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByTerm_Throws_On_Null_Term()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentException>(() => controller.GetContentItemsByTerm(Null.NullString));
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByTerm_Calls_DataService()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName)).Returns(MockHelper.CreateValidContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_ValidName);
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName));
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByTerm_Returns_Empty_List_If_Term_Not_Used()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_UnusedName)).Returns(MockHelper.CreateEmptyContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_UnusedName);
-
-            // Assert
-            Assert.AreEqual(0, contentItems.Count());
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByTerm_Returns_List_Of_ContentItems()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName)).Returns(MockHelper.CreateValidContentItemsReader(
-                Constants.CONTENT_TaggedItemCount,
-                Constants.CONTENT_IndexedFalse,
-                Null.NullInteger,
-                Constants.TERM_ValidName));
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_ValidName);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_TaggedItemCount, contentItems.Count());
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByContentType_Returns_Results()
-        {
-            var mock = new Mock<IDataService>();
-            mock.Setup(ds => ds.GetContentItemsByContentType(It.IsAny<int>()))
-                .Returns(MockHelper.CreateValidContentItemsReader(10, true, 0, null));
-
-            var controller = new ContentController(mock.Object);
-
-            var items = controller.GetContentItemsByContentType(10).ToArray();
-
-            Assert.AreEqual(items.Length, 10);
-        }
-
-        [Test]
-        public void ContentController_GetContentItemsByContentType_Invalid_Id_Returns_No_Elements()
-        {
-            var mock = new Mock<IDataService>();
-            mock.Setup(ds => ds.GetContentItemsByContentType(It.IsAny<int>())).Returns(MockHelper.CreateEmptyContentItemReader());
-
-            var controller = new ContentController(mock.Object);
-
-            var items = controller.GetContentItemsByContentType(-1).ToArray();
-
-            Assert.IsEmpty(items);
-        }
-
-        [Test]
-        public void GetContentItemsByModuleId_With_Negative_ModuleId_Returns_ContentItems()
-        {
-            var mock = new Mock<IDataService>();
-            mock.Setup(ds => ds.GetContentItemsByModuleId(-1)).Returns(MockHelper.CreateValidContentItemsReader(10, false, 0, null));
-            mock.Setup(ds => ds.GetContentItemsByModuleId(0)).Returns(MockHelper.CreateValidContentItemReader());
-
-            var controller = new ContentController(mock.Object);
-
-            var negative = controller.GetContentItemsByModuleId(-1).ToArray();
-            var positive = controller.GetContentItemsByModuleId(0).ToArray();
-
-            Assert.AreEqual(negative.Length, 10);
-            Assert.AreEqual(positive.Length, 1);
-        }
-
-        [Test]
-        public void ContentController_GetUnIndexedContentItems_Calls_DataService()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateValidContentItemReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetUnIndexedContentItems());
-        }
-
-        [Test]
-        public void ContentController_GetUnIndexedContentItems_Returns_EmptyList_If_No_UnIndexed_Items()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateEmptyContentItemReader());
-
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
-
-            // Assert
-            Assert.AreEqual(0, contentItems.Count());
-        }
-
-        [Test]
-        public void ContentController_GetUnIndexedContentItems_Returns_List_Of_UnIndexedContentItems()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateValidContentItemsReader(
-                Constants.CONTENT_IndexedFalseItemCount,
-                Constants.CONTENT_IndexedFalse,
-                Null.NullInteger,
-                Null.NullString));
-
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_IndexedFalseItemCount, contentItems.Count());
-            foreach (ContentItem content in contentItems)
-            {
-                Assert.IsFalse(content.Indexed);
-            }
-        }
-
-        [Test]
-        public void ContentController_UpdateContentItem_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => controller.UpdateContentItem(null));
-        }
-
-        [Test]
-        public void ContentController_UpdateContentItem_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = new ContentItem();
-            content.ContentItemId = Null.NullInteger;
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.UpdateContentItem(content));
-        }
-
-        [Test]
-        public void ContentController_UpdateContentItem_Calls_DataService_On_Valid_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_UpdateContentItemId;
-            content.Content = Constants.CONTENT_UpdateContent;
-            content.ContentKey = Constants.CONTENT_UpdateContentKey;
-
-            // Act
-            controller.UpdateContentItem(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateContentItem(content, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void ContentController_AddMetaData_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => controller.AddMetaData(null, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_AddMetaData_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_AddMetaData_Throws_On_Null_MetaDataName()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Null.NullString, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_AddMetaData_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-
-            // Act
-            controller.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_DeleteMetaData_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => controller.AddMetaData(null, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_DeleteMetaData_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_DeleteMetaData_Throws_On_Null_MetaDataName()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Null.NullString, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_DeleteMetaData_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-
-            // Act
-            controller.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
-        }
-
-        [Test]
-        public void ContentController_GetMetaData_Throws_On_Negative_ContentItemId()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.GetMetaData(Null.NullInteger));
-        }
-
-        [Test]
-        public void ContentController_GetMetaData_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidMetaDataReader());
-            ContentController controller = new ContentController(mockDataService.Object);
-
-            // Act
-            NameValueCollection metaData = controller.GetMetaData(Constants.CONTENT_ValidContentItemId);
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId));
-        }
-
-        [Test]
-        public void ContentController_GetMetaData_Returns_NameValueCollection_Of_MetaData()
-        {
-            // Arrange
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidMetaDataReader());
-
-            mockDataService.Setup(ds =>
-             ds.SynchronizeMetaData(
-                 It.IsAny<ContentItem>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
-             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
-                 (ci, added, deleted) =>
-                 {
-                     deleted.ToList().ForEach(
-                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
-
-                     added.ToList().ForEach(
-                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
-                 });
-
-            var controller = new ContentController(mockDataService.Object);
-
-            // Act
-            var metaData = controller.GetMetaData(Constants.CONTENT_ValidContentItemId);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENT_MetaDataCount, metaData.Count);
-        }
-
-        [Test]
-        public void ContentController_Title_Is_Saved_On_Add()
-        {
-            var mockDataService = new Mock<IDataService>();
-
-            mockDataService.Setup(
-                ds =>
-                    ds.AddContentItem(
-                    It.IsAny<ContentItem>(),
-                    It.IsAny<int>()))
-                .Returns(Constants.CONTENT_AddContentItemId);
-
-            mockDataService.Setup(ds =>
-             ds.SynchronizeMetaData(
-                 It.IsAny<ContentItem>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
-             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
-                 (ci, added, deleted) =>
-                 {
-                     deleted.ToList().ForEach(
-                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
-
-                     added.ToList().ForEach(
-                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
-                 });
-
-            // Return empty set of metadata.
-            mockDataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateValidMetaDataReader);
-
-            var controller = new ContentController(mockDataService.Object);
-
-            // The ContentExtensions methods look this up.
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            var content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-            content.ContentTitle = Constants.CONTENT_ValidTitle;
-
-            // Act
-            controller.AddContentItem(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle));
-        }
-
-        [Test]
-        public void ContentController_Title_Is_Saved_On_Update()
-        {
-            var mockDataService = new Mock<IDataService>();
-
-            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>()))
-                .Returns(Constants.CONTENT_AddContentItemId);
-
-            mockDataService.Setup(ds =>
-             ds.SynchronizeMetaData(
-                 It.IsAny<ContentItem>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
-                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
-             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
-                 (ci, added, deleted) =>
-                 {
-                     deleted.ToList().ForEach(
-                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
-
-                     added.ToList().ForEach(
-                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
-                 });
-
-            // Return empty set of metadata.
-            mockDataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateValidMetaDataReader);
-
-            var controller = new ContentController(mockDataService.Object);
-
-            // The ContentExtensions methods look this up.
-            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
-
-            var content = ContentTestHelper.CreateValidContentItem();
-            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
-            content.ContentTitle = Constants.CONTENT_ValidTitle;
-
-            // Act
-            controller.AddContentItem(content);
-
-            content.ContentTitle = Constants.CONTENT_ValidTitle2;
-            controller.UpdateContentItem(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle));
-            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle2));
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void ContentController_AddContentItem_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => controller.AddContentItem(null));
+        }
+
+        [Test]
+        public void ContentController_AddContentItem_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+
+            // Act
+            int contentId = controller.AddContentItem(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddContentItem(content, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void ContentController_AddContentItem_Returns_ValidId_On_Valid_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>())).Returns(Constants.CONTENT_AddContentItemId);
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+
+            // Act
+            int contentId = controller.AddContentItem(content);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_AddContentItemId, contentId);
+        }
+
+        [Test]
+        public void ContentController_AddContentItem_Sets_ContentItemId_Property_On_Valid_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>())).Returns(Constants.CONTENT_AddContentItemId);
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+
+            // Act
+            int contentId = controller.AddContentItem(content);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_AddContentItemId, content.ContentItemId);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ContentController_DeleteContentItem_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            controller.DeleteContentItem(null);
+        }
+
+        [Test]
+        public void ContentController_DeleteContentItem_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.DeleteContentItem(content));
+        }
+
+        [Test]
+        public void ContentController_DeleteContentItem_Calls_DataService_On_Valid_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_DeleteContentItemId;
+
+            // Act
+            controller.DeleteContentItem(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteContentItem(content.ContentItemId));
+        }
+
+        [Test]
+        public void ContentController_GetContentItem_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.GetContentItem(Null.NullInteger));
+        }
+
+        [Test]
+        public void ContentController_GetContentItem_Returns_Null_On_InValid_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_InValidContentItemId)).Returns(MockHelper.CreateEmptyContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            ContentItem content = controller.GetContentItem(Constants.CONTENT_InValidContentItemId);
+
+            // Assert
+            Assert.IsNull(content);
+        }
+
+        [Test]
+        public void ContentController_GetContentItem_Calls_DataService_On_Valid_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            ContentItem content = controller.GetContentItem(Constants.CONTENT_ValidContentItemId);
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId));
+        }
+
+        [Test]
+        public void ContentController_GetContentItem_Returns_ContentItem_On_Valid_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItem(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            ContentItem content = controller.GetContentItem(Constants.CONTENT_ValidContentItemId);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_ValidContentItemId, content.ContentItemId);
+            Assert.AreEqual(ContentTestHelper.GetContent(Constants.CONTENT_ValidContentItemId), content.Content);
+            Assert.AreEqual(ContentTestHelper.GetContentKey(Constants.CONTENT_ValidContentItemId), content.ContentKey);
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByTerm_Throws_On_Null_Term()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentException>(() => controller.GetContentItemsByTerm(Null.NullString));
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByTerm_Calls_DataService()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName)).Returns(MockHelper.CreateValidContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_ValidName);
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName));
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByTerm_Returns_Empty_List_If_Term_Not_Used()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_UnusedName)).Returns(MockHelper.CreateEmptyContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_UnusedName);
+
+            // Assert
+            Assert.AreEqual(0, contentItems.Count());
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByTerm_Returns_List_Of_ContentItems()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentItemsByTerm(Constants.TERM_ValidName)).Returns(MockHelper.CreateValidContentItemsReader(
+                Constants.CONTENT_TaggedItemCount,
+                Constants.CONTENT_IndexedFalse,
+                Null.NullInteger,
+                Constants.TERM_ValidName));
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetContentItemsByTerm(Constants.TERM_ValidName);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_TaggedItemCount, contentItems.Count());
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByContentType_Returns_Results()
+        {
+            var mock = new Mock<IDataService>();
+            mock.Setup(ds => ds.GetContentItemsByContentType(It.IsAny<int>()))
+                .Returns(MockHelper.CreateValidContentItemsReader(10, true, 0, null));
+
+            var controller = new ContentController(mock.Object);
+
+            var items = controller.GetContentItemsByContentType(10).ToArray();
+
+            Assert.AreEqual(items.Length, 10);
+        }
+
+        [Test]
+        public void ContentController_GetContentItemsByContentType_Invalid_Id_Returns_No_Elements()
+        {
+            var mock = new Mock<IDataService>();
+            mock.Setup(ds => ds.GetContentItemsByContentType(It.IsAny<int>())).Returns(MockHelper.CreateEmptyContentItemReader());
+
+            var controller = new ContentController(mock.Object);
+
+            var items = controller.GetContentItemsByContentType(-1).ToArray();
+
+            Assert.IsEmpty(items);
+        }
+
+        [Test]
+        public void GetContentItemsByModuleId_With_Negative_ModuleId_Returns_ContentItems()
+        {
+            var mock = new Mock<IDataService>();
+            mock.Setup(ds => ds.GetContentItemsByModuleId(-1)).Returns(MockHelper.CreateValidContentItemsReader(10, false, 0, null));
+            mock.Setup(ds => ds.GetContentItemsByModuleId(0)).Returns(MockHelper.CreateValidContentItemReader());
+
+            var controller = new ContentController(mock.Object);
+
+            var negative = controller.GetContentItemsByModuleId(-1).ToArray();
+            var positive = controller.GetContentItemsByModuleId(0).ToArray();
+
+            Assert.AreEqual(negative.Length, 10);
+            Assert.AreEqual(positive.Length, 1);
+        }
+
+        [Test]
+        public void ContentController_GetUnIndexedContentItems_Calls_DataService()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateValidContentItemReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetUnIndexedContentItems());
+        }
+
+        [Test]
+        public void ContentController_GetUnIndexedContentItems_Returns_EmptyList_If_No_UnIndexed_Items()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateEmptyContentItemReader());
+
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
+
+            // Assert
+            Assert.AreEqual(0, contentItems.Count());
+        }
+
+        [Test]
+        public void ContentController_GetUnIndexedContentItems_Returns_List_Of_UnIndexedContentItems()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetUnIndexedContentItems()).Returns(MockHelper.CreateValidContentItemsReader(
+                Constants.CONTENT_IndexedFalseItemCount,
+                Constants.CONTENT_IndexedFalse,
+                Null.NullInteger,
+                Null.NullString));
+
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            IQueryable<ContentItem> contentItems = controller.GetUnIndexedContentItems();
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_IndexedFalseItemCount, contentItems.Count());
+            foreach (ContentItem content in contentItems)
+            {
+                Assert.IsFalse(content.Indexed);
+            }
+        }
+
+        [Test]
+        public void ContentController_UpdateContentItem_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => controller.UpdateContentItem(null));
+        }
+
+        [Test]
+        public void ContentController_UpdateContentItem_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = new ContentItem();
+            content.ContentItemId = Null.NullInteger;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.UpdateContentItem(content));
+        }
+
+        [Test]
+        public void ContentController_UpdateContentItem_Calls_DataService_On_Valid_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_UpdateContentItemId;
+            content.Content = Constants.CONTENT_UpdateContent;
+            content.ContentKey = Constants.CONTENT_UpdateContentKey;
+
+            // Act
+            controller.UpdateContentItem(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateContentItem(content, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void ContentController_AddMetaData_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => controller.AddMetaData(null, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_AddMetaData_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_AddMetaData_Throws_On_Null_MetaDataName()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Null.NullString, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_AddMetaData_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+
+            // Act
+            controller.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_DeleteMetaData_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => controller.AddMetaData(null, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_DeleteMetaData_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_DeleteMetaData_Throws_On_Null_MetaDataName()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.AddMetaData(content, Null.NullString, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_DeleteMetaData_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+
+            // Act
+            controller.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteMetaData(content, Constants.CONTENT_ValidMetaDataName, Constants.CONTENT_ValidMetaDataValue));
+        }
+
+        [Test]
+        public void ContentController_GetMetaData_Throws_On_Negative_ContentItemId()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.GetMetaData(Null.NullInteger));
+        }
+
+        [Test]
+        public void ContentController_GetMetaData_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidMetaDataReader());
+            ContentController controller = new ContentController(mockDataService.Object);
+
+            // Act
+            NameValueCollection metaData = controller.GetMetaData(Constants.CONTENT_ValidContentItemId);
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId));
+        }
+
+        [Test]
+        public void ContentController_GetMetaData_Returns_NameValueCollection_Of_MetaData()
+        {
+            // Arrange
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetMetaData(Constants.CONTENT_ValidContentItemId)).Returns(MockHelper.CreateValidMetaDataReader());
+
+            mockDataService.Setup(ds =>
+             ds.SynchronizeMetaData(
+                 It.IsAny<ContentItem>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
+             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
+                 (ci, added, deleted) =>
+                 {
+                     deleted.ToList().ForEach(
+                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
+
+                     added.ToList().ForEach(
+                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
+                 });
+
+            var controller = new ContentController(mockDataService.Object);
+
+            // Act
+            var metaData = controller.GetMetaData(Constants.CONTENT_ValidContentItemId);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENT_MetaDataCount, metaData.Count);
+        }
+
+        [Test]
+        public void ContentController_Title_Is_Saved_On_Add()
+        {
+            var mockDataService = new Mock<IDataService>();
+
+            mockDataService.Setup(
+                ds =>
+                    ds.AddContentItem(
+                    It.IsAny<ContentItem>(),
+                    It.IsAny<int>()))
+                .Returns(Constants.CONTENT_AddContentItemId);
+
+            mockDataService.Setup(ds =>
+             ds.SynchronizeMetaData(
+                 It.IsAny<ContentItem>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
+             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
+                 (ci, added, deleted) =>
+                 {
+                     deleted.ToList().ForEach(
+                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
+
+                     added.ToList().ForEach(
+                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
+                 });
+
+            // Return empty set of metadata.
+            mockDataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateValidMetaDataReader);
+
+            var controller = new ContentController(mockDataService.Object);
+
+            // The ContentExtensions methods look this up.
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            var content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+            content.ContentTitle = Constants.CONTENT_ValidTitle;
+
+            // Act
+            controller.AddContentItem(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle));
+        }
+
+        [Test]
+        public void ContentController_Title_Is_Saved_On_Update()
+        {
+            var mockDataService = new Mock<IDataService>();
+
+            mockDataService.Setup(ds => ds.AddContentItem(It.IsAny<ContentItem>(), It.IsAny<int>()))
+                .Returns(Constants.CONTENT_AddContentItemId);
+
+            mockDataService.Setup(ds =>
+             ds.SynchronizeMetaData(
+                 It.IsAny<ContentItem>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>(),
+                 It.IsAny<IEnumerable<KeyValuePair<string, string>>>()))
+             .Callback<ContentItem, IEnumerable<KeyValuePair<string, string>>, IEnumerable<KeyValuePair<string, string>>>(
+                 (ci, added, deleted) =>
+                 {
+                     deleted.ToList().ForEach(
+                         item => mockDataService.Object.DeleteMetaData(ci, item.Key, item.Value));
+
+                     added.ToList().ForEach(
+                         item => mockDataService.Object.AddMetaData(ci, item.Key, item.Value));
+                 });
+
+            // Return empty set of metadata.
+            mockDataService.Setup(ds => ds.GetMetaData(It.IsAny<int>())).Returns(MockHelper.CreateValidMetaDataReader);
+
+            var controller = new ContentController(mockDataService.Object);
+
+            // The ContentExtensions methods look this up.
+            ComponentFactory.RegisterComponentInstance<IContentController>(controller);
+
+            var content = ContentTestHelper.CreateValidContentItem();
+            content.ContentItemId = Constants.CONTENT_ValidContentItemId;
+            content.ContentTitle = Constants.CONTENT_ValidTitle;
+
+            // Act
+            controller.AddContentItem(content);
+
+            content.ContentTitle = Constants.CONTENT_ValidTitle2;
+            controller.UpdateContentItem(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle));
+            mockDataService.Verify(ds => ds.AddMetaData(content, AttachmentController.TitleKey, Constants.CONTENT_ValidTitle2));
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentTypeControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentTypeControllerTests.cs
index 88f624fcfc8..95b3c6e8fcf 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentTypeControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/ContentTypeControllerTests.cs	
@@ -2,244 +2,247 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System;
+namespace DotNetNuke.Tests.Content
+{
+    using System;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Content;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Content;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for ContentTypeTests.
-    /// </summary>
-    [TestFixture]
-    public class ContentTypeControllerTests
-    {
-        private Mock<CachingProvider> mockCache;
-
-        [SetUp]
-        public void SetUp()
-        {
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for ContentTypeTests.
+    /// </summary>
+    [TestFixture]
+    public class ContentTypeControllerTests
+    {
+        private Mock<CachingProvider> mockCache;
+
+        [SetUp]
+        public void SetUp()
+        {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            // Register MockCachingProvider
-            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void ContentTypeController_AddContentType_Throws_On_Null_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => contentTypeController.AddContentType(null));
-        }
-
-        [Test]
-        public void ContentTypeController_AddContentType_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            ContentType contentType = ContentTestHelper.CreateValidContentType();
-
-            // Act
-            int contentTypeId = contentTypeController.AddContentType(contentType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddContentType(contentType));
-        }
-
-        [Test]
-        public void ContentTypeController_AddContentType_Returns_ValidId_On_Valid_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddContentType(It.IsAny<ContentType>())).Returns(Constants.CONTENTTYPE_AddContentTypeId);
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            var contentType = ContentTestHelper.CreateValidContentType();
-
-            // Act
-            int contentTypeId = contentTypeController.AddContentType(contentType);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENTTYPE_AddContentTypeId, contentTypeId);
-        }
-
-        [Test]
-        public void ContentTypeController_AddContentType_Sets_ValidId_On_Valid_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddContentType(It.IsAny<ContentType>())).Returns(Constants.CONTENTTYPE_AddContentTypeId);
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            var contentType = ContentTestHelper.CreateValidContentType();
-
-            // Act
-            contentTypeController.AddContentType(contentType);
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENTTYPE_AddContentTypeId, contentType.ContentTypeId);
-        }
-
-        [Test]
-        public void ContentTypeController_DeleteContentType_Throws_On_Null_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => contentTypeController.DeleteContentType(null));
-        }
-
-        [Test]
-        public void ContentTypeController_DeleteContentType_Throws_On_Negative_ContentTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            ContentType contentType = ContentTestHelper.CreateValidContentType();
-            contentType.ContentTypeId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => contentTypeController.DeleteContentType(contentType));
-        }
-
-        [Test]
-        public void ContentTypeController_DeleteContentType_Calls_DataService_On_Valid_ContentTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            var contentType = ContentTestHelper.CreateValidContentType();
-            contentType.ContentTypeId = Constants.CONTENTTYPE_ValidContentTypeId;
-
-            // Act
-            contentTypeController.DeleteContentType(contentType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteContentType(contentType));
-        }
-
-        [Test]
-        public void ContentTypeController_GetContentTypes_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateValidContentTypesReader(Constants.CONTENTTYPE_ValidContentTypeCount));
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act
-            var contentTypes = contentTypeController.GetContentTypes();
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetContentTypes());
-        }
-
-        [Test]
-        public void ContentTypeController_GetContentTypes_Returns_Empty_List_Of_ContentTypes_If_No_ContentTypes()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateEmptyContentTypeReader());
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act
-            var contentTypes = contentTypeController.GetContentTypes();
-
-            // Assert
-            Assert.IsNotNull(contentTypes);
-            Assert.AreEqual(0, contentTypes.Count());
-        }
-
-        [Test]
-        public void ContentTypeController_GetContentTypes_Returns_List_Of_ContentTypes()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateValidContentTypesReader(Constants.CONTENTTYPE_ValidContentTypeCount));
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act
-            var contentTypes = contentTypeController.GetContentTypes();
-
-            // Assert
-            Assert.AreEqual(Constants.CONTENTTYPE_ValidContentTypeCount, contentTypes.Count());
-        }
-
-        [Test]
-        public void ContentTypeController_UpdateContentType_Throws_On_Null_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => contentTypeController.UpdateContentType(null));
-        }
-
-        [Test]
-        public void ContentTypeController_UpdateContentType_Throws_On_Negative_ContentTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            var contentType = ContentTestHelper.CreateValidContentType();
-            contentType.ContentType = Constants.CONTENTTYPE_InValidContentType;
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => contentTypeController.UpdateContentType(contentType));
-        }
-
-        [Test]
-        public void ContentTypeController_UpdateContentType_Calls_DataService_On_Valid_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var contentTypeController = new ContentTypeController(mockDataService.Object);
-
-            var contentType = ContentTestHelper.CreateValidContentType();
-            contentType.ContentTypeId = Constants.CONTENTTYPE_UpdateContentTypeId;
-            contentType.ContentType = Constants.CONTENTTYPE_UpdateContentType;
-
-            // Act
-            contentTypeController.UpdateContentType(contentType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateContentType(contentType));
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            // Register MockCachingProvider
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void ContentTypeController_AddContentType_Throws_On_Null_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => contentTypeController.AddContentType(null));
+        }
+
+        [Test]
+        public void ContentTypeController_AddContentType_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            ContentType contentType = ContentTestHelper.CreateValidContentType();
+
+            // Act
+            int contentTypeId = contentTypeController.AddContentType(contentType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddContentType(contentType));
+        }
+
+        [Test]
+        public void ContentTypeController_AddContentType_Returns_ValidId_On_Valid_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddContentType(It.IsAny<ContentType>())).Returns(Constants.CONTENTTYPE_AddContentTypeId);
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            var contentType = ContentTestHelper.CreateValidContentType();
+
+            // Act
+            int contentTypeId = contentTypeController.AddContentType(contentType);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENTTYPE_AddContentTypeId, contentTypeId);
+        }
+
+        [Test]
+        public void ContentTypeController_AddContentType_Sets_ValidId_On_Valid_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddContentType(It.IsAny<ContentType>())).Returns(Constants.CONTENTTYPE_AddContentTypeId);
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            var contentType = ContentTestHelper.CreateValidContentType();
+
+            // Act
+            contentTypeController.AddContentType(contentType);
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENTTYPE_AddContentTypeId, contentType.ContentTypeId);
+        }
+
+        [Test]
+        public void ContentTypeController_DeleteContentType_Throws_On_Null_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => contentTypeController.DeleteContentType(null));
+        }
+
+        [Test]
+        public void ContentTypeController_DeleteContentType_Throws_On_Negative_ContentTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            ContentType contentType = ContentTestHelper.CreateValidContentType();
+            contentType.ContentTypeId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => contentTypeController.DeleteContentType(contentType));
+        }
+
+        [Test]
+        public void ContentTypeController_DeleteContentType_Calls_DataService_On_Valid_ContentTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            var contentType = ContentTestHelper.CreateValidContentType();
+            contentType.ContentTypeId = Constants.CONTENTTYPE_ValidContentTypeId;
+
+            // Act
+            contentTypeController.DeleteContentType(contentType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteContentType(contentType));
+        }
+
+        [Test]
+        public void ContentTypeController_GetContentTypes_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateValidContentTypesReader(Constants.CONTENTTYPE_ValidContentTypeCount));
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act
+            var contentTypes = contentTypeController.GetContentTypes();
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetContentTypes());
+        }
+
+        [Test]
+        public void ContentTypeController_GetContentTypes_Returns_Empty_List_Of_ContentTypes_If_No_ContentTypes()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateEmptyContentTypeReader());
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act
+            var contentTypes = contentTypeController.GetContentTypes();
+
+            // Assert
+            Assert.IsNotNull(contentTypes);
+            Assert.AreEqual(0, contentTypes.Count());
+        }
+
+        [Test]
+        public void ContentTypeController_GetContentTypes_Returns_List_Of_ContentTypes()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetContentTypes()).Returns(MockHelper.CreateValidContentTypesReader(Constants.CONTENTTYPE_ValidContentTypeCount));
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act
+            var contentTypes = contentTypeController.GetContentTypes();
+
+            // Assert
+            Assert.AreEqual(Constants.CONTENTTYPE_ValidContentTypeCount, contentTypes.Count());
+        }
+
+        [Test]
+        public void ContentTypeController_UpdateContentType_Throws_On_Null_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => contentTypeController.UpdateContentType(null));
+        }
+
+        [Test]
+        public void ContentTypeController_UpdateContentType_Throws_On_Negative_ContentTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            var contentType = ContentTestHelper.CreateValidContentType();
+            contentType.ContentType = Constants.CONTENTTYPE_InValidContentType;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => contentTypeController.UpdateContentType(contentType));
+        }
+
+        [Test]
+        public void ContentTypeController_UpdateContentType_Calls_DataService_On_Valid_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var contentTypeController = new ContentTypeController(mockDataService.Object);
+
+            var contentType = ContentTestHelper.CreateValidContentType();
+            contentType.ContentTypeId = Constants.CONTENTTYPE_UpdateContentTypeId;
+            contentType.ContentType = Constants.CONTENTTYPE_UpdateContentType;
+
+            // Act
+            contentTypeController.UpdateContentType(contentType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateContentType(contentType));
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj
index 626c6fdfa68..5872a2c4d91 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj	
@@ -153,11 +153,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/ScopeTypeControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/ScopeTypeControllerTests.cs
index 01f104f9c10..e81b717b324 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/ScopeTypeControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/ScopeTypeControllerTests.cs	
@@ -2,241 +2,244 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System;
+namespace DotNetNuke.Tests.Content
+{
+    using System;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Entities.Content.Taxonomy;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Content.Taxonomy;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for ScopeTypeTests.
-    /// </summary>
-    [TestFixture]
-    public class ScopeTypeControllerTests
-    {
-        private Mock<CachingProvider> mockCache;
-
-        [SetUp]
-        public void SetUp()
-        {
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for ScopeTypeTests.
+    /// </summary>
+    [TestFixture]
+    public class ScopeTypeControllerTests
+    {
+        private Mock<CachingProvider> mockCache;
+
+        [SetUp]
+        public void SetUp()
+        {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            // Register MockCachingProvider
-            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void ScopeTypeController_AddScopeType_Throws_On_Null_ScopeType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => scopeTypeController.AddScopeType(null));
-        }
-
-        [Test]
-        public void ScopeTypeController_AddScopeType_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            var scopeType = ContentTestHelper.CreateValidScopeType();
-
-            // Act
-            int scopeTypeId = scopeTypeController.AddScopeType(scopeType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddScopeType(scopeType));
-        }
-
-        [Test]
-        public void ScopeTypeController_AddScopeType_Returns_ValidId_On_Valid_ScopeType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddScopeType(It.IsAny<ScopeType>())).Returns(Constants.SCOPETYPE_AddScopeTypeId);
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
-
-            // Act
-            int scopeTypeId = scopeTypeController.AddScopeType(scopeType);
-
-            // Assert
-            Assert.AreEqual(Constants.SCOPETYPE_AddScopeTypeId, scopeTypeId);
-        }
-
-        [Test]
-        public void ScopeTypeController_AddScopeType_Sets_ValidId_On_Valid_ScopeType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddScopeType(It.IsAny<ScopeType>())).Returns(Constants.SCOPETYPE_AddScopeTypeId);
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-            var scopeType = ContentTestHelper.CreateValidScopeType();
-
-            // Act
-            scopeTypeController.AddScopeType(scopeType);
-
-            // Assert
-            Assert.AreEqual(Constants.SCOPETYPE_AddScopeTypeId, scopeType.ScopeTypeId);
-        }
-
-        [Test]
-        public void ScopeTypeController_DeleteScopeType_Throws_On_Null_ScopeType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => scopeTypeController.DeleteScopeType(null));
-        }
-
-        [Test]
-        public void ScopeTypeController_DeleteScopeType_Throws_On_Negative_ScopeTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
-            scopeType.ScopeTypeId = Null.NullInteger;
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => scopeTypeController.DeleteScopeType(scopeType));
-        }
-
-        [Test]
-        public void ScopeTypeController_DeleteScopeType_Calls_DataService_On_Valid_ContentTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            var scopeType = ContentTestHelper.CreateValidScopeType();
-            scopeType.ScopeTypeId = Constants.SCOPETYPE_ValidScopeTypeId;
-
-            // Act
-            scopeTypeController.DeleteScopeType(scopeType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteScopeType(scopeType));
-        }
-
-        [Test]
-        public void ScopeTypeController_GetScopeTypes_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateValidScopeTypesReader(Constants.SCOPETYPE_ValidScopeTypeCount));
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act
-            IQueryable<ScopeType> scopeTypes = scopeTypeController.GetScopeTypes();
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetScopeTypes());
-        }
-
-        [Test]
-        public void ScopeTypeController_GetScopeTypes_Returns_Empty_List_Of_ScopeTypes_If_No_ScopeTypes()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateEmptyScopeTypeReader());
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act
-            var scopeTypes = scopeTypeController.GetScopeTypes();
-
-            // Assert
-            Assert.IsNotNull(scopeTypes);
-            Assert.AreEqual(0, scopeTypes.Count());
-        }
-
-        [Test]
-        public void ScopeTypeController_GetScopeTypes_Returns_List_Of_ScopeTypes()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateValidScopeTypesReader(Constants.SCOPETYPE_ValidScopeTypeCount));
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act
-            var scopeTypes = scopeTypeController.GetScopeTypes();
-
-            // Assert
-            Assert.AreEqual(Constants.SCOPETYPE_ValidScopeTypeCount, scopeTypes.Count());
-        }
-
-        [Test]
-        public void ScopeTypeController_UpdateScopeType_Throws_On_Null_ScopeType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => scopeTypeController.UpdateScopeType(null));
-        }
-
-        [Test]
-        public void ScopeTypeController_UpdateScopeType_Throws_On_Negative_ScopeTypeId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
-            scopeType.ScopeType = Constants.SCOPETYPE_InValidScopeType;
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => scopeTypeController.UpdateScopeType(scopeType));
-        }
-
-        [Test]
-        public void ScopeTypeController_UpdateScopeType_Calls_DataService_On_Valid_ContentType()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
-
-            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
-            scopeType.ScopeTypeId = Constants.SCOPETYPE_UpdateScopeTypeId;
-            scopeType.ScopeType = Constants.SCOPETYPE_UpdateScopeType;
-
-            // Act
-            scopeTypeController.UpdateScopeType(scopeType);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateScopeType(scopeType));
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            // Register MockCachingProvider
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void ScopeTypeController_AddScopeType_Throws_On_Null_ScopeType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => scopeTypeController.AddScopeType(null));
+        }
+
+        [Test]
+        public void ScopeTypeController_AddScopeType_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            var scopeType = ContentTestHelper.CreateValidScopeType();
+
+            // Act
+            int scopeTypeId = scopeTypeController.AddScopeType(scopeType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddScopeType(scopeType));
+        }
+
+        [Test]
+        public void ScopeTypeController_AddScopeType_Returns_ValidId_On_Valid_ScopeType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddScopeType(It.IsAny<ScopeType>())).Returns(Constants.SCOPETYPE_AddScopeTypeId);
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
+
+            // Act
+            int scopeTypeId = scopeTypeController.AddScopeType(scopeType);
+
+            // Assert
+            Assert.AreEqual(Constants.SCOPETYPE_AddScopeTypeId, scopeTypeId);
+        }
+
+        [Test]
+        public void ScopeTypeController_AddScopeType_Sets_ValidId_On_Valid_ScopeType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddScopeType(It.IsAny<ScopeType>())).Returns(Constants.SCOPETYPE_AddScopeTypeId);
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+            var scopeType = ContentTestHelper.CreateValidScopeType();
+
+            // Act
+            scopeTypeController.AddScopeType(scopeType);
+
+            // Assert
+            Assert.AreEqual(Constants.SCOPETYPE_AddScopeTypeId, scopeType.ScopeTypeId);
+        }
+
+        [Test]
+        public void ScopeTypeController_DeleteScopeType_Throws_On_Null_ScopeType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => scopeTypeController.DeleteScopeType(null));
+        }
+
+        [Test]
+        public void ScopeTypeController_DeleteScopeType_Throws_On_Negative_ScopeTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
+            scopeType.ScopeTypeId = Null.NullInteger;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => scopeTypeController.DeleteScopeType(scopeType));
+        }
+
+        [Test]
+        public void ScopeTypeController_DeleteScopeType_Calls_DataService_On_Valid_ContentTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            var scopeType = ContentTestHelper.CreateValidScopeType();
+            scopeType.ScopeTypeId = Constants.SCOPETYPE_ValidScopeTypeId;
+
+            // Act
+            scopeTypeController.DeleteScopeType(scopeType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteScopeType(scopeType));
+        }
+
+        [Test]
+        public void ScopeTypeController_GetScopeTypes_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateValidScopeTypesReader(Constants.SCOPETYPE_ValidScopeTypeCount));
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act
+            IQueryable<ScopeType> scopeTypes = scopeTypeController.GetScopeTypes();
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetScopeTypes());
+        }
+
+        [Test]
+        public void ScopeTypeController_GetScopeTypes_Returns_Empty_List_Of_ScopeTypes_If_No_ScopeTypes()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateEmptyScopeTypeReader());
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act
+            var scopeTypes = scopeTypeController.GetScopeTypes();
+
+            // Assert
+            Assert.IsNotNull(scopeTypes);
+            Assert.AreEqual(0, scopeTypes.Count());
+        }
+
+        [Test]
+        public void ScopeTypeController_GetScopeTypes_Returns_List_Of_ScopeTypes()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetScopeTypes()).Returns(MockHelper.CreateValidScopeTypesReader(Constants.SCOPETYPE_ValidScopeTypeCount));
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act
+            var scopeTypes = scopeTypeController.GetScopeTypes();
+
+            // Assert
+            Assert.AreEqual(Constants.SCOPETYPE_ValidScopeTypeCount, scopeTypes.Count());
+        }
+
+        [Test]
+        public void ScopeTypeController_UpdateScopeType_Throws_On_Null_ScopeType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => scopeTypeController.UpdateScopeType(null));
+        }
+
+        [Test]
+        public void ScopeTypeController_UpdateScopeType_Throws_On_Negative_ScopeTypeId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
+            scopeType.ScopeType = Constants.SCOPETYPE_InValidScopeType;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => scopeTypeController.UpdateScopeType(scopeType));
+        }
+
+        [Test]
+        public void ScopeTypeController_UpdateScopeType_Calls_DataService_On_Valid_ContentType()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var scopeTypeController = new ScopeTypeController(mockDataService.Object);
+
+            ScopeType scopeType = ContentTestHelper.CreateValidScopeType();
+            scopeType.ScopeTypeId = Constants.SCOPETYPE_UpdateScopeTypeId;
+            scopeType.ScopeType = Constants.SCOPETYPE_UpdateScopeType;
+
+            // Act
+            scopeTypeController.UpdateScopeType(scopeType);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateScopeType(scopeType));
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/TermControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/TermControllerTests.cs
index 0aeb25a7cd9..0b45b390503 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/TermControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/TermControllerTests.cs	
@@ -2,626 +2,629 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System;
+namespace DotNetNuke.Tests.Content
+{
+    using System;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Content;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Entities.Content.Taxonomy;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Content;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Content.Taxonomy;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for TermTests.
-    /// </summary>
-    [TestFixture]
-    public class TermControllerTests
-    {
-        private Mock<CachingProvider> mockCache;
-
-        [SetUp]
-        public void SetUp()
-        {
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for TermTests.
+    /// </summary>
+    [TestFixture]
+    public class TermControllerTests
+    {
+        private Mock<CachingProvider> mockCache;
+
+        [SetUp]
+        public void SetUp()
+        {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            Mock<IVocabularyController> vocabularyController = MockHelper.CreateMockVocabularyController();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-
-            // Register MockCachingProvider
-            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void TermController_AddTerm_Throws_On_Null_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.AddTerm(null));
-        }
-
-        [Test]
-        public void TermController_AddTerm_Throws_On_Invalid_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.Name = Constants.TERM_InValidName;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentException>(() => termController.AddTerm(term));
-        }
-
-        [Test]
-        public void TermController_AddTerm_Throws_On_Negative_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.AddTerm(term));
-        }
-
-        [Test]
-        public void TermController_AddTerm_Should_Call_DataService_AddSimpleTerm_If_Term_Is_Simple_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act
-            int termId = termController.AddTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddSimpleTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
-        }
-
-        [Test]
-        public void TermController_AddTerm_Should_Call_DataService_AddHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
-
-            // Act
-            int termId = termController.AddTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddHeirarchicalTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
-        }
-
-        [Test]
-        public void TermController_AddTerm_Returns_Valid_Id_On_Valid_Term_If_Term_Is_Simple_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-            mockDataService.Setup(ds => ds.AddSimpleTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act
-            int termId = termController.AddTerm(term);
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_AddTermId, termId);
-        }
-
-        [Test]
-        public void TermController_AddTerm_Sets_Valid_Id_On_Valid_Term_If_Term_Is_Simple_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-            mockDataService.Setup(ds => ds.AddSimpleTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act
-            termController.AddTerm(term);
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_AddTermId, term.TermId);
-        }
-
-        [Test]
-        public void TermController_AddTerm_Returns_Valid_Id_On_Valid_Term_If_Term_Is_Heirarchical_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-            mockDataService.Setup(ds => ds.AddHeirarchicalTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
-
-            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
-
-            // Act
-            int termId = termController.AddTerm(term);
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_AddTermId, termId);
-        }
-
-        [Test]
-        public void TermController_AddTerm_Sets_Valid_Id_On_Valid_Term_If_Term_Is_Heirarchical_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-            mockDataService.Setup(ds => ds.AddHeirarchicalTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
-
-            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
-
-            // Act
-            termController.AddTerm(term);
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_AddTermId, term.TermId);
-        }
-
-        [Test]
-        public void TermController_AddTerm_Clears_Term_Cache_On_Valid_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act
-            termController.AddTerm(term);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
-        }
-
-        [Test]
-        public void TermController_AddTermToContent_Throws_On_Null_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.AddTermToContent(null, content));
-        }
-
-        [Test]
-        public void TermController_AddTermToContent_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.AddTermToContent(term, null));
-        }
-
-        [Test]
-        public void TermController_AddTermToContent_Should_Call_DataService_If_Valid_Params()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-
-            // Act
-            termController.AddTermToContent(term, content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddTermToContent(term, content));
-        }
-
-        [Test]
-        public void TermController_DeleteTerm_Throws_On_Null_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.DeleteTerm(null));
-        }
-
-        [Test]
-        public void TermController_DeleteTerm_Throws_On_Negative_TermId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            var term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.TermId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.DeleteTerm(term));
-        }
-
-        [Test]
-        public void TermController_DeleteTerm_Should_Call_DataService_DeleteSimpleTerm_If_Term_Is_Simple_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            var term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.TermId = Constants.TERM_DeleteTermId;
-
-            // Act
-            termController.DeleteTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteSimpleTerm(term));
-        }
-
-        [Test]
-        public void TermController_DeleteTerm_Should_Call_DataService_DeleteHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            var term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
-            term.TermId = Constants.TERM_DeleteTermId;
-
-            // Act
-            termController.DeleteTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteHeirarchicalTerm(term));
-        }
-
-        [Test]
-        public void TermController_DeleteTerm_Clears_Term_Cache_On_Valid_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            var term = new Term(Constants.VOCABULARY_ValidVocabularyId) { TermId = Constants.TERM_DeleteTermId };
-
-            // Act
-            termController.DeleteTerm(term);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
-        }
-
-        [Test]
-        public void TermController_GetTerm_Throws_On_Negative_TermId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTerm(Null.NullInteger));
-        }
-
-        [Test]
-        public void TermController_GetTerm_Returns_Null_On_InValidTermId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_InValidTermId)).Returns(MockHelper.CreateEmptyTermReader());
-
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            Term term = termController.GetTerm(Constants.TERM_InValidTermId);
-
-            // Assert
-            Assert.IsNull(term);
-        }
-
-        [Test]
-        public void TermController_GetTerm_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_ValidTermId)).Returns(MockHelper.CreateValidTermReader());
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            Term term = termController.GetTerm(Constants.TERM_ValidTermId);
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetTerm(Constants.TERM_ValidTermId));
-        }
-
-        [Test]
-        public void TermController_GetTerm_Returns_Term_On_Valid_TermId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_ValidTermId)).Returns(MockHelper.CreateValidTermReader());
-
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            var term = termController.GetTerm(Constants.TERM_ValidTermId);
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_ValidTermId, term.TermId);
-            Assert.AreEqual(Constants.TERM_ValidName, term.Name);
-        }
-
-        [Test]
-        public void TermController_GetTermsByContent_Throws_On_Invalid_ContentItemId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTermsByContent(Null.NullInteger));
-        }
-
-        [Test]
-        public void TermController_GetTermsByContent_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1)).Returns(MockHelper.CreateValidTermsReader(
-                Constants.TERM_ValidCountForContent1,
-                v => Constants.TERM_ValidVocabularyId,
-                c => Constants.TERM_ValidContent1));
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            IQueryable<Term> terms = termController.GetTermsByContent(Constants.TERM_ValidContent1);
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1));
-        }
-
-        [Test]
-        public void TermController_GetTermsByContent_Returns_Terms_On_Valid_ContentItemId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1)).Returns(MockHelper.CreateValidTermsReader(
-                Constants.TERM_ValidCountForContent1,
-                v => Constants.TERM_ValidVocabularyId,
-                c => Constants.TERM_ValidContent1));
-
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            var terms = termController.GetTermsByContent(Constants.TERM_ValidContent1).ToList();
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_ValidCountForContent1, terms.Count);
-
-            for (int i = 0; i < Constants.TERM_ValidCountForContent1; i++)
-            {
-                Assert.AreEqual(i + Constants.TERM_ValidTermId, terms[i].TermId);
-                Assert.AreEqual(ContentTestHelper.GetTermName(i + Constants.TERM_ValidTermId), terms[i].Name);
-            }
-        }
-
-        [Test]
-        public void TermController_GetTermsByVocabulary_Throws_On_Invalid_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTermsByVocabulary(Null.NullInteger));
-        }
-
-        [Test]
-        public void TermController_GetTermsByVocabulary_Returns_Terms_On_Valid_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetTermsByVocabulary(Constants.TERM_ValidVocabulary1)).Returns(MockHelper.CreateValidTermsReader(
-                Constants.TERM_ValidCountForVocabulary1,
-                v => Constants.TERM_ValidVocabulary1,
-                c => Constants.TERM_ValidContent1));
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-
-            var termController = new TermController(mockDataService.Object);
-
-            // Act
-            var terms = termController.GetTermsByVocabulary(Constants.TERM_ValidVocabulary1).ToList();
-
-            // Assert
-            Assert.AreEqual(Constants.TERM_ValidCountForVocabulary1, terms.Count);
-
-            for (int i = 0; i < Constants.TERM_ValidCountForVocabulary1; i++)
-            {
-                Assert.AreEqual(i + Constants.TERM_ValidTermId, terms[i].TermId);
-                Assert.AreEqual(ContentTestHelper.GetTermName(i + Constants.TERM_ValidTermId), terms[i].Name);
-            }
-        }
-
-        [Test]
-        public void TermController_GetTermsByVocabulary_Throws_On_Invalid_VocabularyName()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentException>(() => termController.GetTermsByVocabulary(Null.NullString));
-        }
-
-        [Test]
-        public void TermController_RemoveTermsFromContent_Throws_On_Null_ContentItem()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.RemoveTermsFromContent(null));
-        }
-
-        [Test]
-        public void TermController_RemoveTermsFromContent_Should_Call_DataService_If_Valid_Params()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            ContentItem content = ContentTestHelper.CreateValidContentItem();
-
-            // Act
-            termController.RemoveTermsFromContent(content);
-
-            // Assert
-            mockDataService.Verify(ds => ds.RemoveTermsFromContent(content));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Throws_On_Null_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => termController.UpdateTerm(null));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Throws_On_Negative_TermId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Throws_On_Invalid_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.Name = Constants.TERM_InValidName;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Throws_On_Negative_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Should_Call_DataService_UpdateSimpleTerm_If_Term_Is_Simple_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.TermId = Constants.TERM_UpdateTermId;
-            term.Name = Constants.TERM_UpdateName;
-            term.Weight = Constants.TERM_UpdateWeight;
-
-            // Act
-            termController.UpdateTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateSimpleTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Should_Call_DataService_UpdateHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
-            term.TermId = Constants.TERM_UpdateTermId;
-            term.Name = Constants.TERM_UpdateName;
-            term.Weight = Constants.TERM_UpdateWeight;
-
-            // Act
-            termController.UpdateTerm(term);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateHeirarchicalTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
-        }
-
-        [Test]
-        public void TermController_UpdateTerm_Clears_Term_Cache_On_Valid_Term()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var termController = new TermController(mockDataService.Object);
-
-            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
-            term.TermId = Constants.TERM_UpdateTermId;
-            term.Name = Constants.TERM_UpdateName;
-            term.Weight = Constants.TERM_UpdateWeight;
-
-            // Act
-            termController.UpdateTerm(term);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            Mock<IVocabularyController> vocabularyController = MockHelper.CreateMockVocabularyController();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+
+            // Register MockCachingProvider
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void TermController_AddTerm_Throws_On_Null_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.AddTerm(null));
+        }
+
+        [Test]
+        public void TermController_AddTerm_Throws_On_Invalid_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.Name = Constants.TERM_InValidName;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentException>(() => termController.AddTerm(term));
+        }
+
+        [Test]
+        public void TermController_AddTerm_Throws_On_Negative_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.AddTerm(term));
+        }
+
+        [Test]
+        public void TermController_AddTerm_Should_Call_DataService_AddSimpleTerm_If_Term_Is_Simple_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act
+            int termId = termController.AddTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddSimpleTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
+        }
+
+        [Test]
+        public void TermController_AddTerm_Should_Call_DataService_AddHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
+
+            // Act
+            int termId = termController.AddTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddHeirarchicalTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
+        }
+
+        [Test]
+        public void TermController_AddTerm_Returns_Valid_Id_On_Valid_Term_If_Term_Is_Simple_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+            mockDataService.Setup(ds => ds.AddSimpleTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act
+            int termId = termController.AddTerm(term);
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_AddTermId, termId);
+        }
+
+        [Test]
+        public void TermController_AddTerm_Sets_Valid_Id_On_Valid_Term_If_Term_Is_Simple_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+            mockDataService.Setup(ds => ds.AddSimpleTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act
+            termController.AddTerm(term);
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_AddTermId, term.TermId);
+        }
+
+        [Test]
+        public void TermController_AddTerm_Returns_Valid_Id_On_Valid_Term_If_Term_Is_Heirarchical_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+            mockDataService.Setup(ds => ds.AddHeirarchicalTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
+
+            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
+
+            // Act
+            int termId = termController.AddTerm(term);
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_AddTermId, termId);
+        }
+
+        [Test]
+        public void TermController_AddTerm_Sets_Valid_Id_On_Valid_Term_If_Term_Is_Heirarchical_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+            mockDataService.Setup(ds => ds.AddHeirarchicalTerm(It.IsAny<Term>(), It.IsAny<int>())).Returns(Constants.TERM_AddTermId);
+
+            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
+
+            // Act
+            termController.AddTerm(term);
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_AddTermId, term.TermId);
+        }
+
+        [Test]
+        public void TermController_AddTerm_Clears_Term_Cache_On_Valid_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act
+            termController.AddTerm(term);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
+        }
+
+        [Test]
+        public void TermController_AddTermToContent_Throws_On_Null_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.AddTermToContent(null, content));
+        }
+
+        [Test]
+        public void TermController_AddTermToContent_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.AddTermToContent(term, null));
+        }
+
+        [Test]
+        public void TermController_AddTermToContent_Should_Call_DataService_If_Valid_Params()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+
+            // Act
+            termController.AddTermToContent(term, content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddTermToContent(term, content));
+        }
+
+        [Test]
+        public void TermController_DeleteTerm_Throws_On_Null_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.DeleteTerm(null));
+        }
+
+        [Test]
+        public void TermController_DeleteTerm_Throws_On_Negative_TermId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            var term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.TermId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.DeleteTerm(term));
+        }
+
+        [Test]
+        public void TermController_DeleteTerm_Should_Call_DataService_DeleteSimpleTerm_If_Term_Is_Simple_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            var term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.TermId = Constants.TERM_DeleteTermId;
+
+            // Act
+            termController.DeleteTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteSimpleTerm(term));
+        }
+
+        [Test]
+        public void TermController_DeleteTerm_Should_Call_DataService_DeleteHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            var term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
+            term.TermId = Constants.TERM_DeleteTermId;
+
+            // Act
+            termController.DeleteTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteHeirarchicalTerm(term));
+        }
+
+        [Test]
+        public void TermController_DeleteTerm_Clears_Term_Cache_On_Valid_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            var term = new Term(Constants.VOCABULARY_ValidVocabularyId) { TermId = Constants.TERM_DeleteTermId };
+
+            // Act
+            termController.DeleteTerm(term);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
+        }
+
+        [Test]
+        public void TermController_GetTerm_Throws_On_Negative_TermId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTerm(Null.NullInteger));
+        }
+
+        [Test]
+        public void TermController_GetTerm_Returns_Null_On_InValidTermId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_InValidTermId)).Returns(MockHelper.CreateEmptyTermReader());
+
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            Term term = termController.GetTerm(Constants.TERM_InValidTermId);
+
+            // Assert
+            Assert.IsNull(term);
+        }
+
+        [Test]
+        public void TermController_GetTerm_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_ValidTermId)).Returns(MockHelper.CreateValidTermReader());
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            Term term = termController.GetTerm(Constants.TERM_ValidTermId);
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetTerm(Constants.TERM_ValidTermId));
+        }
+
+        [Test]
+        public void TermController_GetTerm_Returns_Term_On_Valid_TermId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTerm(Constants.TERM_ValidTermId)).Returns(MockHelper.CreateValidTermReader());
+
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            var term = termController.GetTerm(Constants.TERM_ValidTermId);
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_ValidTermId, term.TermId);
+            Assert.AreEqual(Constants.TERM_ValidName, term.Name);
+        }
+
+        [Test]
+        public void TermController_GetTermsByContent_Throws_On_Invalid_ContentItemId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTermsByContent(Null.NullInteger));
+        }
+
+        [Test]
+        public void TermController_GetTermsByContent_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1)).Returns(MockHelper.CreateValidTermsReader(
+                Constants.TERM_ValidCountForContent1,
+                v => Constants.TERM_ValidVocabularyId,
+                c => Constants.TERM_ValidContent1));
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            IQueryable<Term> terms = termController.GetTermsByContent(Constants.TERM_ValidContent1);
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1));
+        }
+
+        [Test]
+        public void TermController_GetTermsByContent_Returns_Terms_On_Valid_ContentItemId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTermsByContent(Constants.TERM_ValidContent1)).Returns(MockHelper.CreateValidTermsReader(
+                Constants.TERM_ValidCountForContent1,
+                v => Constants.TERM_ValidVocabularyId,
+                c => Constants.TERM_ValidContent1));
+
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            var terms = termController.GetTermsByContent(Constants.TERM_ValidContent1).ToList();
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_ValidCountForContent1, terms.Count);
+
+            for (int i = 0; i < Constants.TERM_ValidCountForContent1; i++)
+            {
+                Assert.AreEqual(i + Constants.TERM_ValidTermId, terms[i].TermId);
+                Assert.AreEqual(ContentTestHelper.GetTermName(i + Constants.TERM_ValidTermId), terms[i].Name);
+            }
+        }
+
+        [Test]
+        public void TermController_GetTermsByVocabulary_Throws_On_Invalid_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.GetTermsByVocabulary(Null.NullInteger));
+        }
+
+        [Test]
+        public void TermController_GetTermsByVocabulary_Returns_Terms_On_Valid_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetTermsByVocabulary(Constants.TERM_ValidVocabulary1)).Returns(MockHelper.CreateValidTermsReader(
+                Constants.TERM_ValidCountForVocabulary1,
+                v => Constants.TERM_ValidVocabulary1,
+                c => Constants.TERM_ValidContent1));
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+
+            var termController = new TermController(mockDataService.Object);
+
+            // Act
+            var terms = termController.GetTermsByVocabulary(Constants.TERM_ValidVocabulary1).ToList();
+
+            // Assert
+            Assert.AreEqual(Constants.TERM_ValidCountForVocabulary1, terms.Count);
+
+            for (int i = 0; i < Constants.TERM_ValidCountForVocabulary1; i++)
+            {
+                Assert.AreEqual(i + Constants.TERM_ValidTermId, terms[i].TermId);
+                Assert.AreEqual(ContentTestHelper.GetTermName(i + Constants.TERM_ValidTermId), terms[i].Name);
+            }
+        }
+
+        [Test]
+        public void TermController_GetTermsByVocabulary_Throws_On_Invalid_VocabularyName()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentException>(() => termController.GetTermsByVocabulary(Null.NullString));
+        }
+
+        [Test]
+        public void TermController_RemoveTermsFromContent_Throws_On_Null_ContentItem()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.RemoveTermsFromContent(null));
+        }
+
+        [Test]
+        public void TermController_RemoveTermsFromContent_Should_Call_DataService_If_Valid_Params()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            ContentItem content = ContentTestHelper.CreateValidContentItem();
+
+            // Act
+            termController.RemoveTermsFromContent(content);
+
+            // Assert
+            mockDataService.Verify(ds => ds.RemoveTermsFromContent(content));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Throws_On_Null_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => termController.UpdateTerm(null));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Throws_On_Negative_TermId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Throws_On_Invalid_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.Name = Constants.TERM_InValidName;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Throws_On_Negative_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Null.NullInteger);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => termController.UpdateTerm(term));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Should_Call_DataService_UpdateSimpleTerm_If_Term_Is_Simple_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.TermId = Constants.TERM_UpdateTermId;
+            term.Name = Constants.TERM_UpdateName;
+            term.Weight = Constants.TERM_UpdateWeight;
+
+            // Act
+            termController.UpdateTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateSimpleTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Should_Call_DataService_UpdateHeirarchicalTerm_If_Term_Is_Heirarchical_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidHeirarchicalTerm(Constants.VOCABULARY_HierarchyVocabularyId, Constants.TERM_ValidParentTermId);
+            term.TermId = Constants.TERM_UpdateTermId;
+            term.Name = Constants.TERM_UpdateName;
+            term.Weight = Constants.TERM_UpdateWeight;
+
+            // Act
+            termController.UpdateTerm(term);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateHeirarchicalTerm(term, UserController.Instance.GetCurrentUserInfo().UserID));
+        }
+
+        [Test]
+        public void TermController_UpdateTerm_Clears_Term_Cache_On_Valid_Term()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var termController = new TermController(mockDataService.Object);
+
+            Term term = ContentTestHelper.CreateValidSimpleTerm(Constants.VOCABULARY_ValidVocabularyId);
+            term.TermId = Constants.TERM_UpdateTermId;
+            term.Name = Constants.TERM_UpdateName;
+            term.Weight = Constants.TERM_UpdateWeight;
+
+            // Act
+            termController.UpdateTerm(term);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(string.Format(Constants.TERM_CacheKey, Constants.VOCABULARY_ValidVocabularyId)));
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/VocabularyControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Content/VocabularyControllerTests.cs
index 82e483e1941..c141ad0f645 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/VocabularyControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/VocabularyControllerTests.cs	
@@ -2,334 +2,336 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Content
-{
-    using System;
+namespace DotNetNuke.Tests.Content
+{
+    using System;
     using System.Linq;
     using DotNetNuke.Abstractions;
-    using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Content.Data;
-    using DotNetNuke.Entities.Content.Taxonomy;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Tests.Content.Mocks;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Content.Data;
+    using DotNetNuke.Entities.Content.Taxonomy;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Tests.Content.Mocks;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for VocabularyTests.
-    /// </summary>
-    [TestFixture]
-    public class VocabularyControllerTests
-    {
-        private Mock<CachingProvider> mockCache;
-
-        [SetUp]
-        public void SetUp()
-        {
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for VocabularyTests.
+    /// </summary>
+    [TestFixture]
+    public class VocabularyControllerTests
+    {
+        private Mock<CachingProvider> mockCache;
+
+        [SetUp]
+        public void SetUp()
+        {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            // Register MockCachingProvider
-            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Throws_On_Null_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => vocabularyController.AddVocabulary(null));
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Throws_On_Invalid_Name()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.Name = Constants.VOCABULARY_InValidName;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentException>(() => vocabularyController.AddVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Throws_On_Negative_ScopeTypeID()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.ScopeTypeId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.AddVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-
-            // Act
-            int vocabularyId = vocabularyController.AddVocabulary(vocabulary);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddVocabulary(vocabulary, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Returns_ValidId_On_Valid_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddVocabulary(It.IsAny<Vocabulary>(), It.IsAny<int>())).Returns(Constants.VOCABULARY_AddVocabularyId);
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-
-            // Act
-            int vocabularyId = vocabularyController.AddVocabulary(vocabulary);
-
-            // Assert
-            Assert.AreEqual(Constants.VOCABULARY_AddVocabularyId, vocabularyId);
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Sets_ValidId_On_Valid_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddVocabulary(It.IsAny<Vocabulary>(), It.IsAny<int>())).Returns(Constants.VOCABULARY_AddVocabularyId);
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-
-            // Act
-            vocabularyController.AddVocabulary(vocabulary);
-
-            // Assert
-            Assert.AreEqual(Constants.VOCABULARY_AddVocabularyId, vocabulary.VocabularyId);
-        }
-
-        [Test]
-        public void VocabularyController_AddVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-
-            // Act
-            vocabularyController.AddVocabulary(vocabulary);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
-        }
-
-        [Test]
-        public void VocabularyController_DeleteVocabulary_Throws_On_Null_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => vocabularyController.DeleteVocabulary(null));
-        }
-
-        [Test]
-        public void VocabularyController_DeleteVocabulary_Throws_On_Negative_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = new Vocabulary();
-            vocabulary.VocabularyId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.DeleteVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_DeleteVocabulary_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.VocabularyId = Constants.VOCABULARY_ValidVocabularyId;
-
-            // Act
-            vocabularyController.DeleteVocabulary(vocabulary);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_DeleteVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.VocabularyId = Constants.VOCABULARY_ValidVocabularyId;
-
-            // Act
-            vocabularyController.DeleteVocabulary(vocabulary);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
-        }
-
-        [Test]
-        public void VocabularyController_GetVocabularies_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetVocabularies()).Returns(MockHelper.CreateValidVocabulariesReader(Constants.VOCABULARY_ValidCount));
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            // Act
-            IQueryable<Vocabulary> vocabularys = vocabularyController.GetVocabularies();
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetVocabularies());
-        }
-
-        [Test]
-        public void VocabularyController_GetVocabularies_Returns_List_Of_Vocabularies()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetVocabularies()).Returns(MockHelper.CreateValidVocabulariesReader(Constants.VOCABULARY_ValidCount));
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            // Act
-            IQueryable<Vocabulary> vocabularys = vocabularyController.GetVocabularies();
-
-            // Assert
-            Assert.AreEqual(Constants.VOCABULARY_ValidCount, vocabularys.Count());
-        }
-
-        [Test]
-        public void VocabularyController_UpdateVocabulary_Throws_On_Null_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => vocabularyController.UpdateVocabulary(null));
-        }
-
-        [Test]
-        public void VocabularyController_UpdateVocabulary_Throws_On_Negative_VocabularyId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.VocabularyId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_UpdateVocabulary_Throws_On_Invalid_Name()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.Name = Constants.VOCABULARY_InValidName;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_UpdateVocabulary_Throws_On_Negative_ScopeTypeID()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.ScopeTypeId = Null.NullInteger;
-
-            // Act, Arrange
-            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
-        }
-
-        [Test]
-        public void VocabularyController_UpdateVocabulary_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.VocabularyId = Constants.VOCABULARY_UpdateVocabularyId;
-
-            // Act
-            vocabularyController.UpdateVocabulary(vocabulary);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdateVocabulary(vocabulary, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void VocabularyController__UpdateVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var vocabularyController = new VocabularyController(mockDataService.Object);
-
-            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
-            vocabulary.VocabularyId = Constants.VOCABULARY_UpdateVocabularyId;
-
-            // Act
-            vocabularyController.UpdateVocabulary(vocabulary);
-
-            // Assert
-            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            // Register MockCachingProvider
+            this.mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            MockComponentProvider.CreateDataProvider().Setup(c => c.GetProviderPath()).Returns(string.Empty);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Throws_On_Null_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => vocabularyController.AddVocabulary(null));
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Throws_On_Invalid_Name()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.Name = Constants.VOCABULARY_InValidName;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentException>(() => vocabularyController.AddVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Throws_On_Negative_ScopeTypeID()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.ScopeTypeId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.AddVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+
+            // Act
+            int vocabularyId = vocabularyController.AddVocabulary(vocabulary);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddVocabulary(vocabulary, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Returns_ValidId_On_Valid_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddVocabulary(It.IsAny<Vocabulary>(), It.IsAny<int>())).Returns(Constants.VOCABULARY_AddVocabularyId);
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+
+            // Act
+            int vocabularyId = vocabularyController.AddVocabulary(vocabulary);
+
+            // Assert
+            Assert.AreEqual(Constants.VOCABULARY_AddVocabularyId, vocabularyId);
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Sets_ValidId_On_Valid_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddVocabulary(It.IsAny<Vocabulary>(), It.IsAny<int>())).Returns(Constants.VOCABULARY_AddVocabularyId);
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+
+            // Act
+            vocabularyController.AddVocabulary(vocabulary);
+
+            // Assert
+            Assert.AreEqual(Constants.VOCABULARY_AddVocabularyId, vocabulary.VocabularyId);
+        }
+
+        [Test]
+        public void VocabularyController_AddVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+
+            // Act
+            vocabularyController.AddVocabulary(vocabulary);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
+        }
+
+        [Test]
+        public void VocabularyController_DeleteVocabulary_Throws_On_Null_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => vocabularyController.DeleteVocabulary(null));
+        }
+
+        [Test]
+        public void VocabularyController_DeleteVocabulary_Throws_On_Negative_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = new Vocabulary();
+            vocabulary.VocabularyId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.DeleteVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_DeleteVocabulary_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.VocabularyId = Constants.VOCABULARY_ValidVocabularyId;
+
+            // Act
+            vocabularyController.DeleteVocabulary(vocabulary);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_DeleteVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.VocabularyId = Constants.VOCABULARY_ValidVocabularyId;
+
+            // Act
+            vocabularyController.DeleteVocabulary(vocabulary);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
+        }
+
+        [Test]
+        public void VocabularyController_GetVocabularies_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetVocabularies()).Returns(MockHelper.CreateValidVocabulariesReader(Constants.VOCABULARY_ValidCount));
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            // Act
+            IQueryable<Vocabulary> vocabularys = vocabularyController.GetVocabularies();
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetVocabularies());
+        }
+
+        [Test]
+        public void VocabularyController_GetVocabularies_Returns_List_Of_Vocabularies()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetVocabularies()).Returns(MockHelper.CreateValidVocabulariesReader(Constants.VOCABULARY_ValidCount));
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            // Act
+            IQueryable<Vocabulary> vocabularys = vocabularyController.GetVocabularies();
+
+            // Assert
+            Assert.AreEqual(Constants.VOCABULARY_ValidCount, vocabularys.Count());
+        }
+
+        [Test]
+        public void VocabularyController_UpdateVocabulary_Throws_On_Null_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => vocabularyController.UpdateVocabulary(null));
+        }
+
+        [Test]
+        public void VocabularyController_UpdateVocabulary_Throws_On_Negative_VocabularyId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.VocabularyId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_UpdateVocabulary_Throws_On_Invalid_Name()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.Name = Constants.VOCABULARY_InValidName;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_UpdateVocabulary_Throws_On_Negative_ScopeTypeID()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.ScopeTypeId = Null.NullInteger;
+
+            // Act, Arrange
+            Assert.Throws<ArgumentOutOfRangeException>(() => vocabularyController.UpdateVocabulary(vocabulary));
+        }
+
+        [Test]
+        public void VocabularyController_UpdateVocabulary_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.VocabularyId = Constants.VOCABULARY_UpdateVocabularyId;
+
+            // Act
+            vocabularyController.UpdateVocabulary(vocabulary);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdateVocabulary(vocabulary, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void VocabularyController__UpdateVocabulary_Clears_Vocabulary_Cache_On_Valid_Vocabulary()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var vocabularyController = new VocabularyController(mockDataService.Object);
+
+            Vocabulary vocabulary = ContentTestHelper.CreateValidVocabulary();
+            vocabulary.VocabularyId = Constants.VOCABULARY_UpdateVocabularyId;
+
+            // Act
+            vocabularyController.UpdateVocabulary(vocabulary);
+
+            // Assert
+            this.mockCache.Verify(cache => cache.Remove(Constants.VOCABULARY_CacheKey));
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Common/NavigationManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Common/NavigationManagerTests.cs
index b8a9326f001..652f571e410 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Common/NavigationManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Common/NavigationManagerTests.cs	
@@ -2,405 +2,417 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Common
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using DotNetNuke.Abstractions;
-    using DotNetNuke.Abstractions.Portals;
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Services.Localization;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class NavigationManagerTests
-    {
-        private const int TabID = 100;
-        private const int PortalID = 7;
-        private const string DefaultURLPattern = "/Default.aspx?tabid={0}";
-        private const string DefaultSuperTabPattern = "&portalid={0}";
-        private const string ControlKeyPattern = "&ctl={0}";
-        private const string LanguagePattern = "&language={0}";
-        private INavigationManager _navigationManager;
-
-        [TestFixtureSetUp]
-        public void Setup()
-        {
-            this._navigationManager = new NavigationManager(PortalControllerMock());
-            TabController.SetTestableInstance(TabControllerMock());
-            LocaleController.SetTestableInstance(LocaleControllerMock());
-
-            IPortalController PortalControllerMock()
-            {
-                var mockPortalController = new Mock<IPortalController>();
-                mockPortalController
-                    .Setup(x => x.GetCurrentPortalSettings())
-                    .Returns(PortalSettingsMock());
-                mockPortalController
-                    .Setup(x => x.GetCurrentSettings())
-                    .Returns(PortalSettingsMock());
-
-                return mockPortalController.Object;
-
-                PortalSettings PortalSettingsMock()
-                {
-                    var portalSettings = new PortalSettings
-                    {
-                        PortalId = PortalID,
-                        ActiveTab = new TabInfo
-                        {
-                            TabID = TabID
-                        },
-                    };
-
-                    return portalSettings;
-                }
-            }
-
-            ITabController TabControllerMock()
-            {
-                var mockTabController = new Mock<ITabController>();
-                mockTabController
-                    .Setup(x => x.GetTabsByPortal(Null.NullInteger))
-                    .Returns(default(TabCollection));
-                mockTabController
-                    .Setup(x => x.GetTab(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))
-                    .Returns(new TabInfo
-                    {
-                        CultureCode = "en-US",
-                    });
-
-                return mockTabController.Object;
-            }
-
-            ILocaleController LocaleControllerMock()
-            {
-                var mockLocaleController = new Mock<ILocaleController>();
-                mockLocaleController
-                    .Setup(x => x.GetLocales(It.IsAny<int>()))
-                    .Returns(new Dictionary<string, Locale>
-                    {
-                        { "en-US", new Locale() },
-                        { "TEST", new Locale() },
-                    });
-
-                return mockLocaleController.Object;
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void TearDown()
-        {
-            this._navigationManager = null;
-            TabController.ClearInstance();
-            LocaleController.ClearInstance();
-        }
-
-        [Test]
-        public void NavigateUrlTest()
-        {
-            var expected = string.Format(DefaultURLPattern, TabID);
-            var actual = this._navigationManager.NavigateURL();
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        [TestCase(11)]
-        public void NavigateUrl_CustomTabID(int tabId)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId);
-            var actual = this._navigationManager.NavigateURL(tabId);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void NavigateUrl_CustomTab_NotSuperTab()
-        {
-            var customTabId = 55;
-            var expected = string.Format(DefaultURLPattern, customTabId);
-            var actual = this._navigationManager.NavigateURL(customTabId, false);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        [TestCase(11)]
-        public void NavigateUrl_CustomTab_IsSuperTab(int tabId)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId) + string.Format(DefaultSuperTabPattern, PortalID);
-            var actual = this._navigationManager.NavigateURL(tabId, true);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        [Ignore]
-        public void NavigateUrl_ControlKey_AccessDenied()
-        {
-            // TODO - We can't properly test this until we migrate
-            // Globals.AccessDeniedURL to an interface in the abstraction
-            // project. The dependencies go very deep and make it very
-            // difficult to properly test just the NavigationManager logic.
-            var actual = this._navigationManager.NavigateURL("Access Denied");
-        }
-
-        [Test]
-        public void NavigateUrl_ControlKey()
-        {
-            var controlKey = "My-Control-Key";
-            var expected = string.Format(DefaultURLPattern, TabID) + string.Format(ControlKeyPattern, controlKey);
-            var actual = this._navigationManager.NavigateURL(controlKey);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void NavigateUrl_ControlKey_EmptyAdditionalParameter()
-        {
-            var controlKey = "My-Control-Key";
-            var expected = string.Format(DefaultURLPattern, TabID) + string.Format(ControlKeyPattern, controlKey);
-            var actual = this._navigationManager.NavigateURL(controlKey, new string[0]);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void NavigateUrl_ControlKey_SingleAdditionalParameter()
-        {
-            var controlKey = "My-Control-Key";
-            var parameters = new string[] { "My-Parameter" };
-            var expected = string.Format(DefaultURLPattern, TabID) +
-                string.Format(ControlKeyPattern, controlKey) +
-                $"&{parameters[0]}";
-            var actual = this._navigationManager.NavigateURL(controlKey, parameters);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        public void NavigateUrl_ControlKey_MultipleAdditionalParameter(int count)
-        {
-            string[] parameters = new string[count];
-            for (int index = 0; index < count; index++)
-            {
-                parameters[index] = $"My-Parameter{index}";
-            }
-
-            var controlKey = "My-Control-Key";
-            var expected = string.Format(DefaultURLPattern, TabID) +
-                string.Format(ControlKeyPattern, controlKey) +
-                parameters.Select(s => $"&{s}").Aggregate((x, y) => $"{x}{y}");
-            var actual = this._navigationManager.NavigateURL(controlKey, parameters);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        [TestCase(11)]
-        public void NavigateUrl_TabID_ControlKey(int tabId)
-        {
-            var controlKey = "My-Control-Key";
-            var expected = string.Format(DefaultURLPattern, tabId) + string.Format(ControlKeyPattern, controlKey);
-            var actual = this._navigationManager.NavigateURL(tabId, controlKey);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        [TestCase(11)]
-        public void NavigateUrl_TabID_EmptyControlKey(int tabId)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId);
-            var actual = this._navigationManager.NavigateURL(tabId, string.Empty);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        [TestCase(7)]
-        [TestCase(8)]
-        [TestCase(9)]
-        [TestCase(10)]
-        [TestCase(11)]
-        public void NavigateUrl_TabID_NullControlKey(int tabId)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId);
-            var actual = this._navigationManager.NavigateURL(tabId, string.Empty);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(0, "My-Control-Key-0")]
-        [TestCase(1, "My-Control-Key-1")]
-        [TestCase(2, "My-Control-Key-2")]
-        [TestCase(3, "My-Control-Key-3")]
-        [TestCase(4, "My-Control-Key-4")]
-        [TestCase(5, "My-Control-Key-5")]
-        [TestCase(6, "My-Control-Key-6")]
-        [TestCase(7, "My-Control-Key-7")]
-        [TestCase(8, "My-Control-Key-8")]
-        [TestCase(9, "My-Control-Key-9")]
-        [TestCase(10, "My-Control-Key-10")]
-        public void NavigateUrl_TabID_ControlKey_Parameter(int count, string controlKey)
-        {
-            string[] parameters = new string[count];
-            for (int index = 0; index < count; index++)
-            {
-                parameters[index] = $"My-Parameter{index}";
-            }
-
-            var customTabId = 51;
-            var expected = string.Format(DefaultURLPattern, customTabId) +
-                string.Format(ControlKeyPattern, controlKey);
-
-            if (parameters.Length > 0)
-            {
-                expected += parameters.Select(s => $"&{s}").Aggregate((x, y) => $"{x}{y}");
-            }
-
-            var actual = this._navigationManager.NavigateURL(customTabId, controlKey, parameters);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(0, "My-Control-Key-0")]
-        [TestCase(1, "My-Control-Key-1")]
-        [TestCase(2, "My-Control-Key-2")]
-        [TestCase(3, "My-Control-Key-3")]
-        [TestCase(4, "My-Control-Key-4")]
-        [TestCase(5, "My-Control-Key-5")]
-        [TestCase(6, "My-Control-Key-6")]
-        [TestCase(7, "My-Control-Key-7")]
-        [TestCase(8, "My-Control-Key-8")]
-        [TestCase(9, "My-Control-Key-9")]
-        [TestCase(10, "My-Control-Key-10")]
-        public void NavigateUrl_TabID_ControlKey_NullParameter(int tabId, string controlKey)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId) +
-                string.Format(ControlKeyPattern, controlKey);
-
-            var actual = this._navigationManager.NavigateURL(tabId, controlKey, null);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(0, "My-Control-Key-0")]
-        [TestCase(1, "My-Control-Key-1")]
-        [TestCase(2, "My-Control-Key-2")]
-        [TestCase(3, "My-Control-Key-3")]
-        [TestCase(4, "My-Control-Key-4")]
-        [TestCase(5, "My-Control-Key-5")]
-        [TestCase(6, "My-Control-Key-6")]
-        [TestCase(7, "My-Control-Key-7")]
-        [TestCase(8, "My-Control-Key-8")]
-        [TestCase(9, "My-Control-Key-9")]
-        [TestCase(10, "My-Control-Key-10")]
-        public void NavigateUrl_TabId_NullSettings_ControlKey(int tabId, string controlKey)
-        {
-            var expected = string.Format(DefaultURLPattern, tabId) +
-                string.Format(ControlKeyPattern, controlKey);
-
-            var actual = this._navigationManager.NavigateURL(tabId, default(IPortalSettings), controlKey, null);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [TestCase(0, "My-Control-Key-0")]
-        [TestCase(1, "My-Control-Key-1")]
-        [TestCase(2, "My-Control-Key-2")]
-        [TestCase(3, "My-Control-Key-3")]
-        [TestCase(4, "My-Control-Key-4")]
-        [TestCase(5, "My-Control-Key-5")]
-        [TestCase(6, "My-Control-Key-6")]
-        [TestCase(7, "My-Control-Key-7")]
-        [TestCase(8, "My-Control-Key-8")]
-        [TestCase(9, "My-Control-Key-9")]
-        [TestCase(10, "My-Control-Key-10")]
-        public void NavigateUrl_TabId_Settings_ControlKey(int tabId, string controlKey)
-        {
-            var mockSettings = new Mock<IPortalSettings>();
-            mockSettings
-                .Setup(x => x.ContentLocalizationEnabled)
-                .Returns(true);
-
-            var expected = string.Format(DefaultURLPattern, tabId) +
-                string.Format(ControlKeyPattern, controlKey) +
-                string.Format(LanguagePattern, "en-US");
-
-            var actual = this._navigationManager.NavigateURL(tabId, mockSettings.Object, controlKey, null);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(expected, actual);
-        }
-    }
-}
+namespace DotNetNuke.Tests.Core.Common
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Abstractions.Portals;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Services.Localization;
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class NavigationManagerTests
+    {
+        private const int TabID = 100;
+        private const int PortalID = 7;
+        private const string DefaultURLPattern = "/Default.aspx?tabid={0}";
+        private const string DefaultSuperTabPattern = "&portalid={0}";
+        private const string ControlKeyPattern = "&ctl={0}";
+        private const string LanguagePattern = "&language={0}";
+        private INavigationManager navigationManager;
+
+        [TestFixtureSetUp]
+        public void Setup()
+        {
+            this.navigationManager = new NavigationManager(PortalControllerMock());
+            TabController.SetTestableInstance(TabControllerMock());
+            LocaleController.SetTestableInstance(LocaleControllerMock());
+
+            IPortalController PortalControllerMock()
+            {
+                var mockPortalController = new Mock<IPortalController>();
+                mockPortalController
+                    .Setup(x => x.GetCurrentPortalSettings())
+                    .Returns(PortalSettingsMock());
+                mockPortalController
+                    .Setup(x => x.GetCurrentSettings())
+                    .Returns(PortalSettingsMock());
+
+                return mockPortalController.Object;
+
+                PortalSettings PortalSettingsMock()
+                {
+                    var portalSettings = new PortalSettings
+                    {
+                        PortalId = PortalID,
+                        ActiveTab = new TabInfo
+                        {
+                            TabID = TabID
+                        },
+                    };
+
+                    return portalSettings;
+                }
+            }
+
+            ITabController TabControllerMock()
+            {
+                var mockTabController = new Mock<ITabController>();
+                mockTabController
+                    .Setup(x => x.GetTabsByPortal(Null.NullInteger))
+                    .Returns(default(TabCollection));
+                mockTabController
+                    .Setup(x => x.GetTab(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))
+                    .Returns(new TabInfo
+                    {
+                        CultureCode = "en-US",
+                    });
+
+                return mockTabController.Object;
+            }
+
+            ILocaleController LocaleControllerMock()
+            {
+                var mockLocaleController = new Mock<ILocaleController>();
+                mockLocaleController
+                    .Setup(x => x.GetLocales(It.IsAny<int>()))
+                    .Returns(new Dictionary<string, Locale>
+                    {
+                        { "en-US", new Locale() },
+                        { "TEST", new Locale() },
+                    });
+
+                return mockLocaleController.Object;
+            }
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => this.navigationManager);
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            this.navigationManager = null;
+            TabController.ClearInstance();
+            LocaleController.ClearInstance();
+        }
+
+        [Test]
+        public void NavigateUrlTest()
+        {
+            var expected = string.Format(DefaultURLPattern, TabID);
+            var actual = this.navigationManager.NavigateURL();
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        [TestCase(11)]
+        public void NavigateUrl_CustomTabID(int tabId)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId);
+            var actual = this.navigationManager.NavigateURL(tabId);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void NavigateUrl_CustomTab_NotSuperTab()
+        {
+            var customTabId = 55;
+            var expected = string.Format(DefaultURLPattern, customTabId);
+            var actual = this.navigationManager.NavigateURL(customTabId, false);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        [TestCase(11)]
+        public void NavigateUrl_CustomTab_IsSuperTab(int tabId)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId) + string.Format(DefaultSuperTabPattern, PortalID);
+            var actual = this.navigationManager.NavigateURL(tabId, true);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        [Ignore]
+        public void NavigateUrl_ControlKey_AccessDenied()
+        {
+            // TODO - We can't properly test this until we migrate
+            // Globals.AccessDeniedURL to an interface in the abstraction
+            // project. The dependencies go very deep and make it very
+            // difficult to properly test just the NavigationManager logic.
+            var actual = this.navigationManager.NavigateURL("Access Denied");
+        }
+
+        [Test]
+        public void NavigateUrl_ControlKey()
+        {
+            var controlKey = "My-Control-Key";
+            var expected = string.Format(DefaultURLPattern, TabID) + string.Format(ControlKeyPattern, controlKey);
+            var actual = this.navigationManager.NavigateURL(controlKey);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void NavigateUrl_ControlKey_EmptyAdditionalParameter()
+        {
+            var controlKey = "My-Control-Key";
+            var expected = string.Format(DefaultURLPattern, TabID) + string.Format(ControlKeyPattern, controlKey);
+            var actual = this.navigationManager.NavigateURL(controlKey, new string[0]);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void NavigateUrl_ControlKey_SingleAdditionalParameter()
+        {
+            var controlKey = "My-Control-Key";
+            var parameters = new string[] { "My-Parameter" };
+            var expected = string.Format(DefaultURLPattern, TabID) +
+                string.Format(ControlKeyPattern, controlKey) +
+                $"&{parameters[0]}";
+            var actual = this.navigationManager.NavigateURL(controlKey, parameters);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        public void NavigateUrl_ControlKey_MultipleAdditionalParameter(int count)
+        {
+            string[] parameters = new string[count];
+            for (int index = 0; index < count; index++)
+            {
+                parameters[index] = $"My-Parameter{index}";
+            }
+
+            var controlKey = "My-Control-Key";
+            var expected = string.Format(DefaultURLPattern, TabID) +
+                string.Format(ControlKeyPattern, controlKey) +
+                parameters.Select(s => $"&{s}").Aggregate((x, y) => $"{x}{y}");
+            var actual = this.navigationManager.NavigateURL(controlKey, parameters);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        [TestCase(11)]
+        public void NavigateUrl_TabID_ControlKey(int tabId)
+        {
+            var controlKey = "My-Control-Key";
+            var expected = string.Format(DefaultURLPattern, tabId) + string.Format(ControlKeyPattern, controlKey);
+            var actual = this.navigationManager.NavigateURL(tabId, controlKey);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        [TestCase(11)]
+        public void NavigateUrl_TabID_EmptyControlKey(int tabId)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId);
+            var actual = this.navigationManager.NavigateURL(tabId, string.Empty);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(6)]
+        [TestCase(7)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(10)]
+        [TestCase(11)]
+        public void NavigateUrl_TabID_NullControlKey(int tabId)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId);
+            var actual = this.navigationManager.NavigateURL(tabId, string.Empty);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(0, "My-Control-Key-0")]
+        [TestCase(1, "My-Control-Key-1")]
+        [TestCase(2, "My-Control-Key-2")]
+        [TestCase(3, "My-Control-Key-3")]
+        [TestCase(4, "My-Control-Key-4")]
+        [TestCase(5, "My-Control-Key-5")]
+        [TestCase(6, "My-Control-Key-6")]
+        [TestCase(7, "My-Control-Key-7")]
+        [TestCase(8, "My-Control-Key-8")]
+        [TestCase(9, "My-Control-Key-9")]
+        [TestCase(10, "My-Control-Key-10")]
+        public void NavigateUrl_TabID_ControlKey_Parameter(int count, string controlKey)
+        {
+            string[] parameters = new string[count];
+            for (int index = 0; index < count; index++)
+            {
+                parameters[index] = $"My-Parameter{index}";
+            }
+
+            var customTabId = 51;
+            var expected = string.Format(DefaultURLPattern, customTabId) +
+                string.Format(ControlKeyPattern, controlKey);
+
+            if (parameters.Length > 0)
+            {
+                expected += parameters.Select(s => $"&{s}").Aggregate((x, y) => $"{x}{y}");
+            }
+
+            var actual = this.navigationManager.NavigateURL(customTabId, controlKey, parameters);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(0, "My-Control-Key-0")]
+        [TestCase(1, "My-Control-Key-1")]
+        [TestCase(2, "My-Control-Key-2")]
+        [TestCase(3, "My-Control-Key-3")]
+        [TestCase(4, "My-Control-Key-4")]
+        [TestCase(5, "My-Control-Key-5")]
+        [TestCase(6, "My-Control-Key-6")]
+        [TestCase(7, "My-Control-Key-7")]
+        [TestCase(8, "My-Control-Key-8")]
+        [TestCase(9, "My-Control-Key-9")]
+        [TestCase(10, "My-Control-Key-10")]
+        public void NavigateUrl_TabID_ControlKey_NullParameter(int tabId, string controlKey)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId) +
+                string.Format(ControlKeyPattern, controlKey);
+
+            var actual = this.navigationManager.NavigateURL(tabId, controlKey, null);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(0, "My-Control-Key-0")]
+        [TestCase(1, "My-Control-Key-1")]
+        [TestCase(2, "My-Control-Key-2")]
+        [TestCase(3, "My-Control-Key-3")]
+        [TestCase(4, "My-Control-Key-4")]
+        [TestCase(5, "My-Control-Key-5")]
+        [TestCase(6, "My-Control-Key-6")]
+        [TestCase(7, "My-Control-Key-7")]
+        [TestCase(8, "My-Control-Key-8")]
+        [TestCase(9, "My-Control-Key-9")]
+        [TestCase(10, "My-Control-Key-10")]
+        public void NavigateUrl_TabId_NullSettings_ControlKey(int tabId, string controlKey)
+        {
+            var expected = string.Format(DefaultURLPattern, tabId) +
+                string.Format(ControlKeyPattern, controlKey);
+
+            var actual = this.navigationManager.NavigateURL(tabId, default(IPortalSettings), controlKey, null);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestCase(0, "My-Control-Key-0")]
+        [TestCase(1, "My-Control-Key-1")]
+        [TestCase(2, "My-Control-Key-2")]
+        [TestCase(3, "My-Control-Key-3")]
+        [TestCase(4, "My-Control-Key-4")]
+        [TestCase(5, "My-Control-Key-5")]
+        [TestCase(6, "My-Control-Key-6")]
+        [TestCase(7, "My-Control-Key-7")]
+        [TestCase(8, "My-Control-Key-8")]
+        [TestCase(9, "My-Control-Key-9")]
+        [TestCase(10, "My-Control-Key-10")]
+        public void NavigateUrl_TabId_Settings_ControlKey(int tabId, string controlKey)
+        {
+            var mockSettings = new Mock<IPortalSettings>();
+            mockSettings
+                .Setup(x => x.ContentLocalizationEnabled)
+                .Returns(true);
+
+            var expected = string.Format(DefaultURLPattern, tabId) +
+                string.Format(ControlKeyPattern, controlKey) +
+                string.Format(LanguagePattern, "en-US");
+
+            var actual = this.navigationManager.NavigateURL(tabId, mockSettings.Object, controlKey, null);
+
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Host/HostControllerTest.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Host/HostControllerTest.cs
index 4da0b21a1c8..5a4a5698ecb 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Host/HostControllerTest.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Host/HostControllerTest.cs	
@@ -2,415 +2,417 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Host
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
+namespace DotNetNuke.Tests.Core.Controllers.Host
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class HostControllerTest
-    {
-        private DataTable _hostSettingsTable;
-        private Mock<CachingProvider> _mockCache;
-        private Mock<DataProvider> _mockData;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var serviceCollection = new ServiceCollection();
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class HostControllerTest
+    {
+        private DataTable _hostSettingsTable;
+        private Mock<CachingProvider> _mockCache;
+        private Mock<DataProvider> _mockData;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            this._mockCache = MockComponentProvider.CreateDataCacheProvider();
-            MockComponentProvider.CreateEventLogController();
-
-            this._hostSettingsTable = new DataTable("HostSettings");
-
-            var nameCol = this._hostSettingsTable.Columns.Add("SettingName");
-            this._hostSettingsTable.Columns.Add("SettingValue");
-            this._hostSettingsTable.Columns.Add("SettingIsSecure");
-            this._hostSettingsTable.PrimaryKey = new[] { nameCol };
-
-            this._hostSettingsTable.Rows.Add("String_1_S", "String_1_S", true);
-            this._hostSettingsTable.Rows.Add("String_2_S", "String_1_S", true);
-            this._hostSettingsTable.Rows.Add("String_3_U", "Value_3_U", false);
-            this._hostSettingsTable.Rows.Add("String_4_U", "Value_4_U", false);
-            this._hostSettingsTable.Rows.Add("Int_5_U", "5", false);
-            this._hostSettingsTable.Rows.Add("Int_6_S", "6", true);
-            this._hostSettingsTable.Rows.Add("Double_7_S", "7", true);
-            this._hostSettingsTable.Rows.Add("Double_8_U", "8", false);
-            this._hostSettingsTable.Rows.Add("Bool_9_U", false, false);
-            this._hostSettingsTable.Rows.Add("Bool_10_S", false, true);
-
-            this._mockData = MockComponentProvider.CreateDataProvider();
-            this._mockData.Setup(c => c.GetHostSettings()).Returns(this._hostSettingsTable.CreateDataReader());
-            this._mockData.Setup(c => c.GetProviderPath()).Returns(string.Empty);
-
-            DataCache.ClearCache();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        public void HostController_GetSettings_GetList()
-        {
-            // Arrange
-            var expectedDic = new Dictionary<string, ConfigurationSetting>();
-
-            foreach (DataRow row in this._hostSettingsTable.Rows)
-            {
-                var conf = new ConfigurationSetting();
-                conf.Key = row["SettingName"].ToString();
-                conf.Value = row["SettingValue"].ToString();
-                bool IsSecure;
-                bool.TryParse(row["SettingIsSecure"].ToString(), out IsSecure);
-                conf.IsSecure = IsSecure;
-                expectedDic.Add(conf.Key, conf);
-            }
-
-            // Act
-            var settingsDic = HostController.Instance.GetSettings();
-
-            // Assert
-            foreach (var currentConfig in settingsDic)
-            {
-                Assert.AreEqual(currentConfig.Key, currentConfig.Value.Key);
-                Assert.AreEqual(expectedDic[currentConfig.Key].Value, currentConfig.Value.Value);
-                Assert.AreEqual(expectedDic[currentConfig.Key].IsSecure, currentConfig.Value.IsSecure);
-            }
-        }
-
-        [Test]
-        public void HostController_GetSettingsDictionary_GetList()
-        {
-            // Arrange
-            // Convert table to Dictionary<string,string>
-            var expectedDic = this._hostSettingsTable.Rows.Cast<DataRow>().ToDictionary(row => row["SettingName"].ToString(), row => row["SettingValue"].ToString());
-
-            // Act
-            var settingsDic = HostController.Instance.GetSettingsDictionary();
-
-            // Assert
-            CollectionAssert.AreEquivalent(expectedDic.Values, settingsDic.Values);
-        }
-
-        [Test]
-        public void HostController_Update_ExistingValue()
-        {
-            // Arrange
-            const string key = "String_1_S";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
-
-            // Act
-            HostController.Instance.Update(key, value);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
-        }
-
-        [Test]
-        public void HostController_Update_ExistingValue_ResetCache()
-        {
-            // Arrange
-            const string key = "String_1_S";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
-
-            // Act
-            HostController.Instance.Update(key, value);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
-        }
-
-        [Test]
-        public void HostController_Update_ExistingValue_ResetCache_With_Overload()
-        {
-            // Arrange
-            const string key = "String_1_S";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
-
-            // Act
-            HostController.Instance.Update(key, value, true);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
-        }
-
-        [Test]
-        public void HostController_Update_ExistingValue_Dont_Reset_Cache()
-        {
-            // Arrange
-            const string key = "String_1_S";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
-
-            // Act
-            HostController.Instance.Update(key, value, false);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
-
-            // Clear was not called a second time
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Never);
-        }
-
-        [Test]
-        public void HostController_Update_Dictionary()
-        {
-            // Arrange
-            var settings = new Dictionary<string, string>
-                                                      {
-                                                          { "String_1_S", "MyValue" },
-                                                      };
-
-            // Act
-            HostController.Instance.Update(settings);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting("String_1_S", "MyValue", false, It.IsAny<int>()), Times.Exactly(1));
-            this._mockCache.Verify(c => c.Clear("Host", string.Empty), Times.Exactly(1));
-        }
-
-        [Test]
-        public void HostController_Update_NewValue()
-        {
-            // Arrange
-            const string key = "MyKey";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
-
-            // Act
-            HostController.Instance.Update(key, value);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
-        }
-
-        [Test]
-        public void HostController_Update_NewValue_ResetCache_With_Overload()
-        {
-            // Arrange
-            const string key = "MyKey";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
-
-            // Act
-            HostController.Instance.Update(key, value, true);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
-        }
-
-        [Test]
-        public void HostController_Update_NewValue_ResetCache()
-        {
-            // Arrange
-            const string key = "MyKey";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
-
-            // Act
-            HostController.Instance.Update(key, value);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
-        }
-
-        [Test]
-        public void HostController_Update_NewValue_Dont_Reset_Cache()
-        {
-            // Arrange
-            const string key = "MyKey";
-            const string value = "MyValue";
-            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
-
-            // Act
-            HostController.Instance.Update(key, value, false);
-
-            // Assert
-            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
-            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Never);
-        }
-
-        [Test]
-        [TestCase("String_1_S")]
-        [TestCase("String_2_S")]
-        [TestCase("String_3_U")]
-        [TestCase("String_4_U")]
-        public void HostController_GetString_If_Key_Exists(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetString(key), this.GetValue(key));
-            Assert.AreEqual(HostController.Instance.GetString(key, "Hello Default"), this.GetValue(key));
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetString_InvalidKey_Returns_Null_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetString(key), Null.NullString);
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetString_InvalidKey_Returns_Default_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetString(key, "Hello Default"), "Hello Default");
-        }
-
-        [Test]
-        [TestCase("")]
-        [TestCase(null)]
-        [ExpectedException(typeof(ArgumentException))]
-        public void HostController_GetString_NullEmpty(string key)
-        {
-            HostController.Instance.GetString(key);
-        }
-
-        [Test]
-        [TestCase("Int_5_U")]
-        [TestCase("Int_6_S")]
-        public void HostController_GetInteger_If_Key_Exists(string key)
-        {
-            int s = HostController.Instance.GetInteger(key);
-            Assert.AreEqual(s.ToString(), this.GetValue(key));
-            Assert.AreEqual(HostController.Instance.GetInteger(key, 12).ToString(), this.GetValue(key));
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetInteger_InvalidKey_Returns_Null_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetInteger(key), Null.NullInteger);
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetInteger_InvalidKey_Returns_Default_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetInteger(key, 6969), 6969);
-        }
-
-        [Test]
-        [TestCase("")]
-        [TestCase(null)]
-        [ExpectedException(typeof(ArgumentException))]
-        public void HostController_GetInteger_NullEmpty(string key)
-        {
-            HostController.Instance.GetInteger(key);
-        }
-
-        [Test]
-        [TestCase("Bool_9_U")]
-        [TestCase("Bool_10_S")]
-        public void HostController_GetBoolean_If_Key_Exists(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetBoolean(key).ToString(), this.GetValue(key));
-            Assert.AreEqual(HostController.Instance.GetBoolean(key, false).ToString(), this.GetValue(key));
-            Assert.AreEqual(HostController.Instance.GetBoolean(key, true).ToString(), this.GetValue(key));
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetBoolean_InvalidKey_Returns_Null_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetBoolean(key), Null.NullBoolean);
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetBoolean_InvalidKey_Returns_Default_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetBoolean(key, true), true);
-            Assert.AreEqual(HostController.Instance.GetBoolean(key, false), false);
-        }
-
-        [Test]
-        [TestCase("")]
-        [TestCase(null)]
-        [ExpectedException(typeof(ArgumentException))]
-        public void HostController_GetBoolean_NullEmpty(string key)
-        {
-            HostController.Instance.GetBoolean(key);
-        }
-
-        [Test]
-        [TestCase("Double_7_S")]
-        [TestCase("Double_8_U")]
-        public void HostController_GetDouble_If_Key_Exists(string key)
-        {
-            double s = HostController.Instance.GetDouble(key);
-            Assert.AreEqual(s.ToString(), this.GetValue(key));
-            Assert.AreEqual(HostController.Instance.GetDouble(key, 54.54).ToString(), this.GetValue(key));
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetDouble_InvalidKey_Returns_Null_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetDouble(key), Null.NullDouble);
-        }
-
-        [Test]
-        [TestCase("BadKey1")]
-        [TestCase("AAAAAAA")]
-        public void HostController_GetDouble_InvalidKey_Returns_Default_Value(string key)
-        {
-            Assert.AreEqual(HostController.Instance.GetDouble(key, 21.58), 21.58);
-        }
-
-        [Test]
-        [TestCase("")]
-        [TestCase(null)]
-        [ExpectedException(typeof(ArgumentException))]
-        public void HostController_GetDouble_NullEmpty(string key)
-        {
-            HostController.Instance.GetDouble(key);
-        }
-
-        private string GetValue(string key)
-        {
-            return this._hostSettingsTable.Rows.Find(key)["SettingValue"].ToString();
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            this._mockCache = MockComponentProvider.CreateDataCacheProvider();
+            MockComponentProvider.CreateEventLogController();
+
+            this._hostSettingsTable = new DataTable("HostSettings");
+
+            var nameCol = this._hostSettingsTable.Columns.Add("SettingName");
+            this._hostSettingsTable.Columns.Add("SettingValue");
+            this._hostSettingsTable.Columns.Add("SettingIsSecure");
+            this._hostSettingsTable.PrimaryKey = new[] { nameCol };
+
+            this._hostSettingsTable.Rows.Add("String_1_S", "String_1_S", true);
+            this._hostSettingsTable.Rows.Add("String_2_S", "String_1_S", true);
+            this._hostSettingsTable.Rows.Add("String_3_U", "Value_3_U", false);
+            this._hostSettingsTable.Rows.Add("String_4_U", "Value_4_U", false);
+            this._hostSettingsTable.Rows.Add("Int_5_U", "5", false);
+            this._hostSettingsTable.Rows.Add("Int_6_S", "6", true);
+            this._hostSettingsTable.Rows.Add("Double_7_S", "7", true);
+            this._hostSettingsTable.Rows.Add("Double_8_U", "8", false);
+            this._hostSettingsTable.Rows.Add("Bool_9_U", false, false);
+            this._hostSettingsTable.Rows.Add("Bool_10_S", false, true);
+
+            this._mockData = MockComponentProvider.CreateDataProvider();
+            this._mockData.Setup(c => c.GetHostSettings()).Returns(this._hostSettingsTable.CreateDataReader());
+            this._mockData.Setup(c => c.GetProviderPath()).Returns(string.Empty);
+
+            DataCache.ClearCache();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        public void HostController_GetSettings_GetList()
+        {
+            // Arrange
+            var expectedDic = new Dictionary<string, ConfigurationSetting>();
+
+            foreach (DataRow row in this._hostSettingsTable.Rows)
+            {
+                var conf = new ConfigurationSetting();
+                conf.Key = row["SettingName"].ToString();
+                conf.Value = row["SettingValue"].ToString();
+                bool IsSecure;
+                bool.TryParse(row["SettingIsSecure"].ToString(), out IsSecure);
+                conf.IsSecure = IsSecure;
+                expectedDic.Add(conf.Key, conf);
+            }
+
+            // Act
+            var settingsDic = HostController.Instance.GetSettings();
+
+            // Assert
+            foreach (var currentConfig in settingsDic)
+            {
+                Assert.AreEqual(currentConfig.Key, currentConfig.Value.Key);
+                Assert.AreEqual(expectedDic[currentConfig.Key].Value, currentConfig.Value.Value);
+                Assert.AreEqual(expectedDic[currentConfig.Key].IsSecure, currentConfig.Value.IsSecure);
+            }
+        }
+
+        [Test]
+        public void HostController_GetSettingsDictionary_GetList()
+        {
+            // Arrange
+            // Convert table to Dictionary<string,string>
+            var expectedDic = this._hostSettingsTable.Rows.Cast<DataRow>().ToDictionary(row => row["SettingName"].ToString(), row => row["SettingValue"].ToString());
+
+            // Act
+            var settingsDic = HostController.Instance.GetSettingsDictionary();
+
+            // Assert
+            CollectionAssert.AreEquivalent(expectedDic.Values, settingsDic.Values);
+        }
+
+        [Test]
+        public void HostController_Update_ExistingValue()
+        {
+            // Arrange
+            const string key = "String_1_S";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
+
+            // Act
+            HostController.Instance.Update(key, value);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
+        }
+
+        [Test]
+        public void HostController_Update_ExistingValue_ResetCache()
+        {
+            // Arrange
+            const string key = "String_1_S";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
+
+            // Act
+            HostController.Instance.Update(key, value);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
+        }
+
+        [Test]
+        public void HostController_Update_ExistingValue_ResetCache_With_Overload()
+        {
+            // Arrange
+            const string key = "String_1_S";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
+
+            // Act
+            HostController.Instance.Update(key, value, true);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()), Times.Exactly(1));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Exactly(1));
+        }
+
+        [Test]
+        public void HostController_Update_ExistingValue_Dont_Reset_Cache()
+        {
+            // Arrange
+            const string key = "String_1_S";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(key).Read()).Returns(true);
+
+            // Act
+            HostController.Instance.Update(key, value, false);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
+
+            // Clear was not called a second time
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Never);
+        }
+
+        [Test]
+        public void HostController_Update_Dictionary()
+        {
+            // Arrange
+            var settings = new Dictionary<string, string>
+                                                      {
+                                                          { "String_1_S", "MyValue" },
+                                                      };
+
+            // Act
+            HostController.Instance.Update(settings);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting("String_1_S", "MyValue", false, It.IsAny<int>()), Times.Exactly(1));
+            this._mockCache.Verify(c => c.Clear("Host", string.Empty), Times.Exactly(1));
+        }
+
+        [Test]
+        public void HostController_Update_NewValue()
+        {
+            // Arrange
+            const string key = "MyKey";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
+
+            // Act
+            HostController.Instance.Update(key, value);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
+        }
+
+        [Test]
+        public void HostController_Update_NewValue_ResetCache_With_Overload()
+        {
+            // Arrange
+            const string key = "MyKey";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
+
+            // Act
+            HostController.Instance.Update(key, value, true);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
+        }
+
+        [Test]
+        public void HostController_Update_NewValue_ResetCache()
+        {
+            // Arrange
+            const string key = "MyKey";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
+
+            // Act
+            HostController.Instance.Update(key, value);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Once);
+        }
+
+        [Test]
+        public void HostController_Update_NewValue_Dont_Reset_Cache()
+        {
+            // Arrange
+            const string key = "MyKey";
+            const string value = "MyValue";
+            this._mockData.Setup(c => c.GetHostSetting(It.IsAny<string>()).Read()).Returns(false);
+
+            // Act
+            HostController.Instance.Update(key, value, false);
+
+            // Assert
+            this._mockData.Verify(c => c.UpdateHostSetting(key, value, false, It.IsAny<int>()));
+            this._mockCache.Verify(c => c.Remove("DNN_HostSettings"), Times.Never);
+        }
+
+        [Test]
+        [TestCase("String_1_S")]
+        [TestCase("String_2_S")]
+        [TestCase("String_3_U")]
+        [TestCase("String_4_U")]
+        public void HostController_GetString_If_Key_Exists(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetString(key), this.GetValue(key));
+            Assert.AreEqual(HostController.Instance.GetString(key, "Hello Default"), this.GetValue(key));
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetString_InvalidKey_Returns_Null_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetString(key), Null.NullString);
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetString_InvalidKey_Returns_Default_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetString(key, "Hello Default"), "Hello Default");
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase(null)]
+        [ExpectedException(typeof(ArgumentException))]
+        public void HostController_GetString_NullEmpty(string key)
+        {
+            HostController.Instance.GetString(key);
+        }
+
+        [Test]
+        [TestCase("Int_5_U")]
+        [TestCase("Int_6_S")]
+        public void HostController_GetInteger_If_Key_Exists(string key)
+        {
+            int s = HostController.Instance.GetInteger(key);
+            Assert.AreEqual(s.ToString(), this.GetValue(key));
+            Assert.AreEqual(HostController.Instance.GetInteger(key, 12).ToString(), this.GetValue(key));
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetInteger_InvalidKey_Returns_Null_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetInteger(key), Null.NullInteger);
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetInteger_InvalidKey_Returns_Default_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetInteger(key, 6969), 6969);
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase(null)]
+        [ExpectedException(typeof(ArgumentException))]
+        public void HostController_GetInteger_NullEmpty(string key)
+        {
+            HostController.Instance.GetInteger(key);
+        }
+
+        [Test]
+        [TestCase("Bool_9_U")]
+        [TestCase("Bool_10_S")]
+        public void HostController_GetBoolean_If_Key_Exists(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetBoolean(key).ToString(), this.GetValue(key));
+            Assert.AreEqual(HostController.Instance.GetBoolean(key, false).ToString(), this.GetValue(key));
+            Assert.AreEqual(HostController.Instance.GetBoolean(key, true).ToString(), this.GetValue(key));
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetBoolean_InvalidKey_Returns_Null_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetBoolean(key), Null.NullBoolean);
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetBoolean_InvalidKey_Returns_Default_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetBoolean(key, true), true);
+            Assert.AreEqual(HostController.Instance.GetBoolean(key, false), false);
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase(null)]
+        [ExpectedException(typeof(ArgumentException))]
+        public void HostController_GetBoolean_NullEmpty(string key)
+        {
+            HostController.Instance.GetBoolean(key);
+        }
+
+        [Test]
+        [TestCase("Double_7_S")]
+        [TestCase("Double_8_U")]
+        public void HostController_GetDouble_If_Key_Exists(string key)
+        {
+            double s = HostController.Instance.GetDouble(key);
+            Assert.AreEqual(s.ToString(), this.GetValue(key));
+            Assert.AreEqual(HostController.Instance.GetDouble(key, 54.54).ToString(), this.GetValue(key));
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetDouble_InvalidKey_Returns_Null_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetDouble(key), Null.NullDouble);
+        }
+
+        [Test]
+        [TestCase("BadKey1")]
+        [TestCase("AAAAAAA")]
+        public void HostController_GetDouble_InvalidKey_Returns_Default_Value(string key)
+        {
+            Assert.AreEqual(HostController.Instance.GetDouble(key, 21.58), 21.58);
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase(null)]
+        [ExpectedException(typeof(ArgumentException))]
+        public void HostController_GetDouble_NullEmpty(string key)
+        {
+            HostController.Instance.GetDouble(key);
+        }
+
+        private string GetValue(string key)
+        {
+            return this._hostSettingsTable.Rows.Find(key)["SettingValue"].ToString();
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/NotificationsControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/NotificationsControllerTests.cs
index 2f9341d0b38..f8138cbb0b1 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/NotificationsControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/NotificationsControllerTests.cs	
@@ -2,1316 +2,1318 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-// ReSharper disable InconsistentNaming
-namespace DotNetNuke.Tests.Core.Controllers.Messaging
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.Globalization;
+// ReSharper disable InconsistentNaming
+namespace DotNetNuke.Tests.Core.Controllers.Messaging
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.Globalization;
     using System.Text;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Security.Roles;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Social.Messaging;
-    using DotNetNuke.Services.Social.Messaging.Exceptions;
-    using DotNetNuke.Services.Social.Messaging.Internal;
-    using DotNetNuke.Services.Social.Notifications;
-    using DotNetNuke.Services.Social.Notifications.Data;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Security.Roles;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Social.Messaging;
+    using DotNetNuke.Services.Social.Messaging.Internal;
+    using DotNetNuke.Services.Social.Notifications;
+    using DotNetNuke.Services.Social.Notifications.Data;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class NotificationsControllerTests
-    {
-        private Mock<IDataService> _mockDataService;
-        private Mock<IPortalController> _portalController;
-        private Mock<IPortalGroupController> _portalGroupController;
-        private Mock<DotNetNuke.Services.Social.Messaging.Data.IDataService> _mockMessagingDataService;
-        private Mock<IMessagingController> _mockMessagingController;
-        private Mock<IInternalMessagingController> _mockInternalMessagingController;
-        private NotificationsController _notificationsController;
-        private Mock<NotificationsController> _mockNotificationsController;
-        private Mock<DataProvider> _dataProvider;
-        private Mock<CachingProvider> _cachingProvider;
-        private DataTable _dtNotificationTypes;
-        private DataTable _dtNotificationTypeActions;
-        private DataTable _dtNotificationActions;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var serviceCollection = new ServiceCollection();
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class NotificationsControllerTests
+    {
+        private Mock<IDataService> _mockDataService;
+        private Mock<IPortalController> _portalController;
+        private Mock<IPortalGroupController> _portalGroupController;
+        private Mock<DotNetNuke.Services.Social.Messaging.Data.IDataService> _mockMessagingDataService;
+        private Mock<IMessagingController> _mockMessagingController;
+        private Mock<IInternalMessagingController> _mockInternalMessagingController;
+        private NotificationsController _notificationsController;
+        private Mock<NotificationsController> _mockNotificationsController;
+        private Mock<DataProvider> _dataProvider;
+        private Mock<CachingProvider> _cachingProvider;
+        private DataTable _dtNotificationTypes;
+        private DataTable _dtNotificationTypeActions;
+        private DataTable _dtNotificationActions;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            ComponentFactory.Container = new SimpleContainer();
-
-            this._mockDataService = new Mock<IDataService>();
-            this._portalController = new Mock<IPortalController>();
-            this._portalGroupController = new Mock<IPortalGroupController>();
-
-            this._mockMessagingDataService = new Mock<DotNetNuke.Services.Social.Messaging.Data.IDataService>();
-            this._dataProvider = MockComponentProvider.CreateDataProvider();
-            this._cachingProvider = MockComponentProvider.CreateDataCacheProvider();
-
-            this._notificationsController = new NotificationsController(this._mockDataService.Object, this._mockMessagingDataService.Object);
-            this._mockNotificationsController = new Mock<NotificationsController> { CallBase = true };
-
-            this._mockMessagingController = new Mock<IMessagingController>();
-            MessagingController.SetTestableInstance(this._mockMessagingController.Object);
-            PortalController.SetTestableInstance(this._portalController.Object);
-            PortalGroupController.RegisterInstance(this._portalGroupController.Object);
-
-            this._mockInternalMessagingController = new Mock<IInternalMessagingController>();
-            InternalMessagingController.SetTestableInstance(this._mockInternalMessagingController.Object);
-
-            DataService.RegisterInstance(this._mockDataService.Object);
-            DotNetNuke.Services.Social.Messaging.Data.DataService.RegisterInstance(this._mockMessagingDataService.Object);
-
-            this.SetupDataProvider();
-            this.SetupDataTables();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            ComponentFactory.Container = null;
-            MessagingController.ClearInstance();
-            PortalController.ClearInstance();
-            InternalMessagingController.ClearInstance();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void CreateNotificationType_Throws_On_Null_NotificationType()
-        {
-            this._notificationsController.CreateNotificationType(null);
-        }
-
-        [Test]
-        [TestCase("")]
-        [TestCase(null)]
-        [ExpectedException(typeof(ArgumentException))]
-        public void CreateNotificationType_Throws_On_Null_Or_Empty_Name(string name)
-        {
-            var notificationType = CreateNewNotificationType();
-            notificationType.Name = name;
-
-            this._notificationsController.CreateNotificationType(notificationType);
-        }
-
-        [Test]
-        public void CreateNotificationType_Calls_DataService_CreateNotificationType()
-        {
-            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
-
-            this._mockDataService
-                .Setup(ds => ds.CreateNotificationType(Constants.Messaging_NotificationTypeName, It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), Constants.UserID_User12, It.IsAny<bool>()))
-                .Verifiable();
-
-            this._mockNotificationsController.Object.CreateNotificationType(CreateNewNotificationType());
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        [TestCase(int.MaxValue, int.MaxValue)]
-        [TestCase(1, 1)]
-        [TestCase(0, 0)]
-        public void CreateNotificationType_Returns_Object_With_Valid_TimeToLive(int actualTimeToLiveTotalMinutes, int expectedTimeToLiveTotalMinutes)
-        {
-            var actualTimeToLive = TimeSpan.FromMinutes(actualTimeToLiveTotalMinutes);
-
-            var notificationType = CreateNewNotificationType();
-            notificationType.TimeToLive = actualTimeToLive;
-            this._notificationsController.CreateNotificationType(notificationType);
-
-            Assert.AreEqual(expectedTimeToLiveTotalMinutes, (int)notificationType.TimeToLive.TotalMinutes);
-        }
-
-        [Test]
-        public void CreateNotificationType_Makes_Valid_Object()
-        {
-            var expectedNotificationType = CreateValidNotificationType();
-
-            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
-
-            this._mockDataService
-                .Setup(ds => ds.CreateNotificationType(
-                    expectedNotificationType.Name,
-                    expectedNotificationType.Description,
-                    (int)expectedNotificationType.TimeToLive.TotalMinutes,
-                    expectedNotificationType.DesktopModuleId,
-                    Constants.UserID_User12, false))
-                .Returns(Constants.Messaging_NotificationTypeId);
-
-            var actualNotificationType = CreateNewNotificationType();
-            this._mockNotificationsController.Object.CreateNotificationType(actualNotificationType);
-
-            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
-        }
-
-        [Test]
-        public void DeleteNotificationType_Calls_DataService_DeleteNotificationType()
-        {
-            this._mockDataService.Setup(ds => ds.DeleteNotificationType(Constants.Messaging_NotificationTypeId)).Verifiable();
-            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeCache());
-            this._mockNotificationsController.Object.DeleteNotificationType(Constants.Messaging_NotificationTypeId);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void DeleteNotificationType_Removes_Cache_Object()
-        {
-            this._mockDataService.Setup(ds => ds.DeleteNotificationType(Constants.Messaging_NotificationTypeId));
-            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeCache()).Verifiable();
-            this._mockNotificationsController.Object.DeleteNotificationType(Constants.Messaging_NotificationTypeId);
-            this._mockNotificationsController.Verify();
-        }
-
-        [Test]
-        public void GetNotificationType_By_Id_Gets_Object_From_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
-            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
-            this._cachingProvider.Verify();
-        }
-
-        [Test]
-        public void GetNotificationType_By_Id_Calls_DataService_GetNotificationType_When_Object_Is_Not_In_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            var messageTypeDataTable = new DataTable();
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationType(Constants.Messaging_NotificationTypeId))
-                .Returns(messageTypeDataTable.CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotificationType_By_Id_Returns_Valid_Object()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            var expectedNotificationType = CreateValidNotificationType();
-
-            this._dtNotificationTypes.Rows.Clear();
-
-            this._dtNotificationTypes.Rows.Add(
-                expectedNotificationType.NotificationTypeId,
-                expectedNotificationType.Name,
-                expectedNotificationType.Description,
-                (int)expectedNotificationType.TimeToLive.TotalMinutes,
-                expectedNotificationType.DesktopModuleId);
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationType(Constants.Messaging_NotificationTypeId))
-                .Returns(this._dtNotificationTypes.CreateDataReader());
-
-            var actualNotificationType = this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
-
-            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void GetNotificationType_By_Name_Throws_On_Null_Or_Empty_Name(string name)
-        {
-            this._notificationsController.GetNotificationType(name);
-        }
-
-        [Test]
-        public void GetNotificationType_By_Name_Gets_Object_From_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
-            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
-            this._cachingProvider.Verify();
-        }
-
-        [Test]
-        public void GetNotificationType_By_Name_Calls_DataService_GetNotificationTypeByName_When_Object_Is_Not_In_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeByName(Constants.Messaging_NotificationTypeName))
-                .Returns(this._dtNotificationTypes.CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotificationType_By_Name_Returns_Valid_Object()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            var expectedNotificationType = CreateValidNotificationType();
-
-            this._dtNotificationTypes.Rows.Clear();
-
-            this._dtNotificationTypes.Rows.Add(
-                expectedNotificationType.NotificationTypeId,
-                expectedNotificationType.Name,
-                expectedNotificationType.Description,
-                (int)expectedNotificationType.TimeToLive.TotalMinutes,
-                expectedNotificationType.DesktopModuleId);
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeByName(Constants.Messaging_NotificationTypeName))
-                .Returns(this._dtNotificationTypes.CreateDataReader());
-
-            var actualNotificationType = this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
-
-            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void SetNotificationTypeActions_Throws_On_Null()
-        {
-            this._notificationsController.SetNotificationTypeActions(null, Constants.Messaging_NotificationTypeId);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SetNotificationTypeActions_Throws_On_EmptyList()
-        {
-            this._notificationsController.SetNotificationTypeActions(new List<NotificationTypeAction>(), Constants.Messaging_NotificationTypeId);
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SetNotificationTypeActions_Throws_On_Null_Or_Empty_Name(string name)
-        {
-            var action = CreateNewNotificationTypeAction();
-            action.NameResourceKey = name;
-            this._notificationsController.SetNotificationTypeActions(new[] { action }, Constants.Messaging_NotificationTypeId);
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SetNotificationTypeActions_Throws_On_Null_Or_Empty_APICall(string apiCall)
-        {
-            var action = CreateNewNotificationTypeAction();
-            action.APICall = apiCall;
-            this._notificationsController.SetNotificationTypeActions(new[] { action }, Constants.Messaging_NotificationTypeId);
-        }
-
-        [Test]
-        public void SetNotificationTypeActions_Calls_DataService_AddNotificationTypeAction_For_Each_Of_Two_Actions()
-        {
-            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
-
-            // _mockDataService
-            //                .Setup(ds => ds.AddNotificationTypeAction(
-            //                    Constants.Messaging_NotificationTypeId,
-            //                    Constants.Messaging_NotificationTypeActionNameResourceKey,
-            //                    Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
-            //                    Constants.Messaging_NotificationTypeActionConfirmResourceKey,
-            //                    Constants.Messaging_NotificationTypeActionAPICall,
-            //                    Constants.UserID_User12))
-            //                .Verifiable();
-            this._mockNotificationsController.Setup(nc => nc.GetNotificationTypeAction(It.IsAny<int>()));
-
-            this._mockNotificationsController.Object.SetNotificationTypeActions(
-                new[] { CreateNewNotificationTypeAction(), CreateNewNotificationTypeAction() },
-                Constants.Messaging_NotificationTypeId);
-
-            this._mockDataService.Verify(
-                x => x.AddNotificationTypeAction(
-                Constants.Messaging_NotificationTypeId,
-                Constants.Messaging_NotificationTypeActionNameResourceKey,
-                Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
-                Constants.Messaging_NotificationTypeActionConfirmResourceKey,
-                Constants.Messaging_NotificationTypeActionAPICall,
-                Constants.UserID_User12), Times.Exactly(2));
-        }
-
-        [Test]
-        public void SetNotificationTypeActions_Sets_NotificationTypeActionId_And_NotificationTypeId()
-        {
-            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
-
-            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
-
-            this._mockDataService
-                .Setup(ds => ds.AddNotificationTypeAction(
-                    expectedNotificationTypeAction.NotificationTypeId,
-                    expectedNotificationTypeAction.NameResourceKey,
-                    expectedNotificationTypeAction.DescriptionResourceKey,
-                    expectedNotificationTypeAction.ConfirmResourceKey,
-                    expectedNotificationTypeAction.APICall,
-                    Constants.UserID_User12))
-                .Returns(expectedNotificationTypeAction.NotificationTypeActionId);
-
-            this._mockNotificationsController
-                .Setup(nc => nc.GetNotificationTypeAction(expectedNotificationTypeAction.NotificationTypeActionId))
-                .Returns(expectedNotificationTypeAction);
-
-            var action = CreateNewNotificationTypeAction();
-            this._mockNotificationsController.Object.SetNotificationTypeActions(new[] { action }, expectedNotificationTypeAction.NotificationTypeId);
-
-            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, action));
-        }
-
-        [Test]
-        public void DeleteNotificationTypeAction_Calls_DataService_DeleteNotificationTypeAction()
-        {
-            this._mockDataService.Setup(ds => ds.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId)).Verifiable();
-            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeActionCache());
-            this._mockNotificationsController.Object.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void DeleteNotificationTypeAction_Removes_Cache_Object()
-        {
-            this._mockDataService.Setup(ds => ds.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId));
-            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeActionCache()).Verifiable();
-            this._mockNotificationsController.Object.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
-            this._mockNotificationsController.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Id_Gets_Object_From_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
-            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
-            this._cachingProvider.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Id_Calls_DataService_GetNotificationTypeAction_When_Object_Is_Not_In_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId))
-                .Returns(this._dtNotificationTypeActions.CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Id_Returns_Valid_Object()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
-
-            this._dtNotificationTypeActions.Clear();
-
-            this._dtNotificationTypeActions.Rows.Add(
-                expectedNotificationTypeAction.NotificationTypeActionId,
-                expectedNotificationTypeAction.NotificationTypeId,
-                expectedNotificationTypeAction.NameResourceKey,
-                expectedNotificationTypeAction.DescriptionResourceKey,
-                expectedNotificationTypeAction.ConfirmResourceKey,
-                expectedNotificationTypeAction.Order,
-                expectedNotificationTypeAction.APICall);
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId))
-                .Returns(this._dtNotificationTypeActions.CreateDataReader);
-
-            var actualNotificationTypeAction = this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
-
-            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeAction));
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void GetNotificationTypeAction_By_Name_Throws_On_Null_Or_Empty_Name(string name)
-        {
-            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, name);
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Name_Gets_Object_From_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
-            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
-            this._cachingProvider.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Name_Calls_DataService_GetNotificationTypeActionByName_When_Object_Is_Not_In_Cache()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeActionByName(
-                    Constants.Messaging_NotificationTypeId,
-                    Constants.Messaging_NotificationTypeActionNameResourceKey))
-                .Returns(this._dtNotificationTypeActions.CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeAction_By_Name_Returns_Valid_Object()
-        {
-            this._cachingProvider.Object.PurgeCache();
-
-            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
-
-            this._dtNotificationTypeActions.Clear();
-
-            this._dtNotificationTypeActions.Rows.Add(
-                expectedNotificationTypeAction.NotificationTypeActionId,
-                expectedNotificationTypeAction.NotificationTypeId,
-                expectedNotificationTypeAction.NameResourceKey,
-                expectedNotificationTypeAction.DescriptionResourceKey,
-                expectedNotificationTypeAction.ConfirmResourceKey,
-                expectedNotificationTypeAction.Order,
-                expectedNotificationTypeAction.APICall);
-
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeActionByName(
-                    Constants.Messaging_NotificationTypeId,
-                    Constants.Messaging_NotificationTypeActionNameResourceKey))
-                .Returns(this._dtNotificationTypeActions.CreateDataReader());
-
-            var actualNotificationTypeAction = this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
-
-            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeAction));
-        }
-
-        [Test]
-        public void GetNotificationTypeActions_Calls_DataService_GetNotificationTypeActions()
-        {
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId))
-                .Returns(this._dtNotificationTypeActions.CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotificationTypeActions_Returns_Valid_Object()
-        {
-            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
-
-            this._dtNotificationTypeActions.Clear();
-
-            this._dtNotificationTypeActions.Rows.Add(
-                expectedNotificationTypeAction.NotificationTypeActionId,
-                expectedNotificationTypeAction.NotificationTypeId,
-                expectedNotificationTypeAction.NameResourceKey,
-                expectedNotificationTypeAction.DescriptionResourceKey,
-                expectedNotificationTypeAction.ConfirmResourceKey,
-                expectedNotificationTypeAction.Order,
-                expectedNotificationTypeAction.APICall);
-
-            this._mockDataService.Setup(ds => ds.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId)).Returns(this._dtNotificationTypeActions.CreateDataReader());
-
-            var actualNotificationTypeActions = this._notificationsController.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId);
-
-            Assert.AreEqual(1, actualNotificationTypeActions.Count);
-            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeActions[0]));
-        }
-
-        [Test]
-        public void SendNotification_Sets_Empty_SenderUserId_With_Admin()
-        {
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.CONTENT_ValidPortalId,
-            };
-
-            this._mockNotificationsController.Setup(nc => nc.GetAdminUser()).Returns(adminUser);
-
-            this._mockNotificationsController
-                .Setup(nc => nc.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero,
-                    It.IsAny<IList<RoleInfo>>(),
-                    It.IsAny<IList<UserInfo>>()));
-
-            var notification = CreateUnsavedNotification();
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                new List<RoleInfo>(),
-                new List<UserInfo>());
-
-            Assert.AreEqual(adminUser.UserID, notification.SenderUserID);
-        }
-
-        [Test]
-        [TestCase(null, null)]
-        [TestCase(null, "")]
-        [TestCase("", null)]
-        [TestCase("", "")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SendNotification_Throws_On_Null_Or_Empty_Subject_And_Body(string subject, string body)
-        {
-            var notification = CreateUnsavedNotification();
-            notification.Subject = subject;
-            notification.Body = body;
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                new List<RoleInfo>(),
-                new List<UserInfo>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SendNotification_Throws_On_Null_Roles_And_Users()
-        {
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.SendNotification(
-                CreateUnsavedNotification(),
-                Constants.PORTAL_Zero,
-                null,
-                null);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SendNotification_Throws_On_Large_Subject()
-        {
-            var notification = CreateUnsavedNotification();
-            var subject = new StringBuilder();
-            for (var i = 0; i <= 40; i++)
-            {
-                subject.Append("1234567890");
-            }
-
-            notification.Subject = subject.ToString();
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                new List<RoleInfo>(),
-                new List<UserInfo>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SendNotification_Throws_On_Roles_And_Users_With_No_DisplayNames()
-        {
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.SendNotification(
-                CreateUnsavedNotification(),
-                Constants.PORTAL_Zero,
-                new List<RoleInfo>(),
-                new List<UserInfo>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SendNotification_Throws_On_Large_To_List()
-        {
-            var roles = new List<RoleInfo>();
-            var users = new List<UserInfo>();
-
-            for (var i = 0; i <= 100; i++)
-            {
-                roles.Add(new RoleInfo { RoleName = "1234567890" });
-                users.Add(new UserInfo { DisplayName = "1234567890" });
-            }
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.SendNotification(
-                CreateUnsavedNotification(),
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-        }
-
-        [Test]
-        public void SendNotification_Calls_DataService_On_Valid_Notification()
-        {
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.PORTAL_Zero,
-            };
-
-            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            var roles = new List<RoleInfo>();
-            var users = new List<UserInfo>
-                            {
-                                new UserInfo
-                                    {
-                                        UserID = Constants.UserID_User12,
-                                        DisplayName = Constants.UserDisplayName_User12
-                                    },
-                            };
-
-            this._mockDataService
-                .Setup(ds => ds.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero))
-                .Verifiable();
-
-            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
-
-            var notification = CreateUnsavedNotification();
-            notification.SenderUserID = adminUser.UserID;
-            notification.SendToast = false;
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void SendNotification_Calls_DataService_On_Valid_Notification_When_Portal_Is_In_Group()
-        {
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.PORTAL_Zero,
-            };
-
-            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
-            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
-
-            var roles = new List<RoleInfo>();
-            var users = new List<UserInfo>
-                            {
-                                new UserInfo
-                                    {
-                                        UserID = Constants.UserID_User12,
-                                        DisplayName = Constants.UserDisplayName_User12
-                                    },
-                            };
-
-            this._mockDataService
-                .Setup(ds => ds.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero))
-                .Verifiable();
-
-            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
-
-            var notification = CreateUnsavedNotification();
-            notification.SenderUserID = adminUser.UserID;
-            notification.SendToast = false;
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void SendNotification_Calls_Messaging_DataService_CreateSocialMessageRecipientsForRole_When_Passing_Roles()
-        {
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.PORTAL_Zero,
-            };
-
-            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            var roles = new List<RoleInfo>
-                            {
-                                new RoleInfo
-                                    {
-                                        RoleID = Constants.RoleID_RegisteredUsers,
-                                        RoleName = Constants.RoleName_RegisteredUsers
-                                    },
-                            };
-            var users = new List<UserInfo>();
-
-            this._mockDataService
-                .Setup(ds => ds.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero))
-                .Returns(Constants.Messaging_MessageId_1);
-
-            this._mockMessagingDataService
-                .Setup(mds => mds.CreateMessageRecipientsForRole(
-                    Constants.Messaging_MessageId_1,
-                    Constants.RoleID_RegisteredUsers.ToString(CultureInfo.InvariantCulture),
-                    It.IsAny<int>()))
-                .Verifiable();
-
-            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
-
-            var notification = CreateUnsavedNotification();
-            notification.SenderUserID = adminUser.UserID;
-            notification.SendToast = false;
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-
-            this._mockMessagingDataService.Verify();
-        }
-
-        [Test]
-        public void SendNotification_Calls_Messaging_DataService_SaveSocialMessageRecipient_When_Passing_Users()
-        {
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.PORTAL_Zero,
-            };
-
-            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            var roles = new List<RoleInfo>();
-            var users = new List<UserInfo>
-                            {
-                                new UserInfo
-                                    {
-                                        UserID = Constants.UserID_User12,
-                                        DisplayName = Constants.UserDisplayName_User12
-                                    },
-                            };
-
-            this._mockDataService
-                .Setup(ds => ds.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero))
-                .Returns(Constants.Messaging_MessageId_1);
-
-            this._mockInternalMessagingController
-                .Setup(mc => mc.GetMessageRecipient(
-                    Constants.Messaging_MessageId_1,
-                    Constants.UserID_User12))
-                .Returns((MessageRecipient)null);
-
-            this._mockMessagingDataService
-                .Setup(mds => mds.SaveMessageRecipient(
-                    It.Is<MessageRecipient>(mr =>
-                                            mr.MessageID == Constants.Messaging_MessageId_1 &&
-                                            mr.UserID == Constants.UserID_User12 &&
-                                            mr.Read == false &&
-                                            mr.RecipientID == Null.NullInteger),
-                    It.IsAny<int>()))
-                .Verifiable();
-
-            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
-
-            var notification = CreateUnsavedNotification();
-            notification.SenderUserID = adminUser.UserID;
-            notification.SendToast = false;
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-
-            this._mockMessagingDataService.Verify();
-        }
-
-        [Test]
-        public void SendNotification_Returns_Valid_Object()
-        {
-            var expectedNotification = CreateValidNotification();
-
-            var adminUser = new UserInfo
-            {
-                UserID = Constants.UserID_Admin,
-                DisplayName = Constants.UserDisplayName_Admin,
-                PortalID = Constants.PORTAL_Zero,
-            };
-
-            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            var roles = new List<RoleInfo>();
-            var users = new List<UserInfo>
-                            {
-                                new UserInfo
-                                    {
-                                        UserID = Constants.UserID_User12,
-                                        DisplayName = Constants.UserDisplayName_User12
-                                    },
-                            };
-
-            this._mockDataService
-                .Setup(ds => ds.SendNotification(
-                    It.IsAny<Notification>(),
-                    Constants.PORTAL_Zero))
-                .Returns(Constants.Messaging_MessageId_1);
-
-            this._mockMessagingDataService
-                .Setup(mds => mds.CreateMessageRecipientsForRole(
-                    Constants.Messaging_MessageId_1,
-                    Constants.RoleID_RegisteredUsers.ToString(CultureInfo.InvariantCulture),
-                    It.IsAny<int>()));
-
-            this._mockInternalMessagingController
-                .Setup(mc => mc.GetMessageRecipient(
-                    Constants.Messaging_MessageId_1,
-                    Constants.UserID_User12))
-                .Returns((MessageRecipient)null);
-
-            this._mockMessagingDataService
-                .Setup(mds => mds.SaveMessageRecipient(
-                    It.Is<MessageRecipient>(mr =>
-                                            mr.MessageID == Constants.Messaging_MessageId_1 &&
-                                            mr.UserID == Constants.UserID_User12 &&
-                                            mr.Read == false &&
-                                            mr.RecipientID == Null.NullInteger),
-                    It.IsAny<int>()));
-
-            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
-
-            var notification = CreateUnsavedNotification();
-            notification.SenderUserID = adminUser.UserID;
-            notification.SendToast = false;
-
-            this._mockNotificationsController.Object.SendNotification(
-                notification,
-                Constants.PORTAL_Zero,
-                roles,
-                users);
-
-            Assert.IsTrue(new NotificationComparer().Equals(expectedNotification, notification));
-        }
-
-        [Test]
-        public void DeleteNotification_Calls_DataService_DeleteNotification()
-        {
-            var messageRecipients = new List<MessageRecipient>
-                                        {
-                                            new MessageRecipient(),
-                                        };
-
-            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(messageRecipients);
-
-            this._mockDataService.Setup(ds => ds.DeleteNotification(Constants.Messaging_MessageId_1)).Verifiable();
-            this._notificationsController.DeleteNotification(Constants.Messaging_MessageId_1);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotifications_Calls_DataService_GetNotifications()
-        {
-            this._mockDataService
-                .Setup(ds => ds.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, It.IsAny<int>(), It.IsAny<int>()))
-                .Returns(new DataTable().CreateDataReader())
-                .Verifiable();
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            this._notificationsController.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, 0, 10);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotifications_Calls_DataService_GetNotifications_When_Portal_Is_In_Group()
-        {
-            this._mockDataService
-                .Setup(ds => ds.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, It.IsAny<int>(), It.IsAny<int>()))
-                .Returns(new DataTable().CreateDataReader())
-                .Verifiable();
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
-            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
-
-            this._notificationsController.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, 0, 10);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void GetNotifications_Calls_DataService_GetNotificationByContext()
-        {
-            this._mockDataService
-                .Setup(ds => ds.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext))
-                .Returns(new DataTable().CreateDataReader())
-                .Verifiable();
-
-            this._notificationsController.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void CountNotifications_Calls_DataService_CountNotifications()
-        {
-            this._mockDataService.Setup(ds => ds.CountNotifications(Constants.UserID_User12, Constants.PORTAL_Zero)).Verifiable();
-            this._notificationsController.CountNotifications(Constants.UserID_User12, Constants.PORTAL_Zero);
-            this._mockDataService.Verify();
-        }
-
-        [Test]
-        public void DeleteNotificationRecipient_Calls_MessagingController_DeleteMessageRecipient()
-        {
-            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12)).Verifiable();
-            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
-            this._notificationsController.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
-            this._mockMessagingController.Verify();
-        }
-
-        [Test]
-        public void DeleteNotificationRecipientByContext_Calls_DeleteMessageRecipient()
-        {
-            this._mockNotificationsController.Setup(mc => mc.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12)).Verifiable();
-            this._mockNotificationsController.Setup(mc => mc.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext))
-                .Returns(new List<Notification> { new Notification { NotificationID = Constants.Messaging_MessageId_1 } });
-            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext, Constants.UserID_User12);
-            this._mockMessagingController.Verify();
-        }
-
-        [Test]
-        public void DeleteNotificationRecipient_Does_Not_Delete_Notification_When_There_Are_More_Recipients()
-        {
-            var messageRecipients = new List<MessageRecipient>
-                                        {
-                                            new MessageRecipient(),
-                                        };
-
-            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12));
-            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(messageRecipients);
-            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
-
-            this._mockNotificationsController.Verify(nc => nc.DeleteNotification(Constants.Messaging_MessageId_1), Times.Never());
-        }
-
-        [Test]
-        public void DeleteNotificationRecipient_Deletes_Notification_When_There_Are_No_More_Recipients()
-        {
-            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12));
-            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
-            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
-            this._mockNotificationsController.Verify(nc => nc.DeleteNotification(Constants.Messaging_MessageId_1));
-        }
-
-        [Test]
-        public void DeleteAllNotificationRecipients_Calls_DeleteNotificationRecipient_For_Each_Recipient()
-        {
-            var recipients = new List<MessageRecipient>
-                                 {
-                                     new MessageRecipient { RecipientID = Constants.Messaging_RecipientId_1 },
-                                     new MessageRecipient { RecipientID = Constants.Messaging_RecipientId_2 },
-                                 };
-
-            this._mockInternalMessagingController.Setup(imc => imc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(recipients);
-
-            this._mockNotificationsController.Object.DeleteAllNotificationRecipients(Constants.Messaging_MessageId_1);
-
-            this._mockNotificationsController.Verify(nc => nc.DeleteNotificationRecipient(It.IsAny<int>(), It.IsAny<int>()), Times.Exactly(2));
-        }
-
-        [Test]
-        public void DeleteAllNotificationRecipients_Does_Not_Call_DeleteNotificationRecipient_When_Notification_Has_No_Recipients()
-        {
-            this._mockInternalMessagingController.Setup(imc => imc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
-            this._mockNotificationsController.Object.DeleteAllNotificationRecipients(Constants.Messaging_MessageId_1);
-            this._mockNotificationsController.Verify(nc => nc.DeleteNotificationRecipient(It.IsAny<int>(), It.IsAny<int>()), Times.Never());
-        }
-
-        private static Notification CreateUnsavedNotification()
-        {
-            return new Notification
-            {
-                NotificationTypeID = Constants.Messaging_NotificationTypeId,
-                Subject = Constants.Messaging_NotificationSubject,
-                Body = Constants.Messaging_NotificationBody,
-                To = Constants.UserDisplayName_User12,
-                From = Constants.UserDisplayName_Admin,
-                SenderUserID = Constants.UserID_Admin,
-                Context = Constants.Messaging_NotificationContext,
-                SendToast = false,
-            };
-        }
-
-        private static Notification CreateValidNotification()
-        {
-            var notification = CreateUnsavedNotification();
-            notification.NotificationID = Constants.Messaging_MessageId_1;
-
-            return notification;
-        }
-
-        private static NotificationType CreateValidNotificationType()
-        {
-            var nt = CreateNewNotificationType();
-            nt.NotificationTypeId = Constants.Messaging_NotificationTypeId;
-            return nt;
-        }
-
-        private static NotificationType CreateNewNotificationType()
-        {
-            return new NotificationType
-            {
-                Name = Constants.Messaging_NotificationTypeName,
-                Description = Constants.Messaging_NotificationTypeDescription,
-                TimeToLive = new TimeSpan(0, Constants.Messaging_NotificationTypeTTL, 0),
-                DesktopModuleId = Constants.Messaging_NotificationTypeDesktopModuleId,
-                IsTask = false,
-            };
-        }
-
-        private static NotificationTypeAction CreateValidNotificationTypeAction()
-        {
-            var action = CreateNewNotificationTypeAction();
-
-            action.NotificationTypeActionId = Constants.Messaging_NotificationTypeActionId;
-            action.NotificationTypeId = Constants.Messaging_NotificationTypeId;
-
-            return action;
-        }
-
-        private static NotificationTypeAction CreateNewNotificationTypeAction()
-        {
-            return new NotificationTypeAction
-            {
-                APICall = Constants.Messaging_NotificationTypeActionAPICall,
-                ConfirmResourceKey = Constants.Messaging_NotificationTypeActionConfirmResourceKey,
-                DescriptionResourceKey = Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
-                NameResourceKey = Constants.Messaging_NotificationTypeActionNameResourceKey,
-            };
-        }
-
-        private static PortalInfo CreatePortalInfo(int portalId, int portalGroupId)
-        {
-            var mockPortalInfo = new PortalInfo { PortalID = portalId, PortalGroupID = portalGroupId };
-            return mockPortalInfo;
-        }
-
-        private static PortalGroupInfo CreatePortalGroupInfo(int portalGroupId, int masterPortalId)
-        {
-            var mockPortalGroupInfo = new PortalGroupInfo
-            {
-                PortalGroupId = portalGroupId,
-                MasterPortalId = masterPortalId,
-                PortalGroupName = Constants.PORTALGROUP_ValidName,
-                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
-            };
-
-            return mockPortalGroupInfo;
-        }
-
-        private void SetupDataProvider()
-        {
-            // Standard DataProvider Path for Logging
-            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-        }
-
-        private void SetupDataTables()
-        {
-            this._dtNotificationTypes = new DataTable();
-            this._dtNotificationTypes.Columns.Add("NotificationTypeID", typeof(int));
-            this._dtNotificationTypes.Columns.Add("Name", typeof(string));
-            this._dtNotificationTypes.Columns.Add("Description", typeof(string));
-            this._dtNotificationTypes.Columns.Add("TTL", typeof(int));
-            this._dtNotificationTypes.Columns.Add("DesktopModuleID", typeof(int));
-            this._dtNotificationTypes.Columns.Add("CreatedByUserID", typeof(int));
-            this._dtNotificationTypes.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this._dtNotificationTypes.Columns.Add("LastModifiedByUserID", typeof(int));
-            this._dtNotificationTypes.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-            this._dtNotificationTypes.Columns.Add("IsTask", typeof(bool));
-
-            this._dtNotificationTypeActions = new DataTable();
-            this._dtNotificationTypeActions.Columns.Add("NotificationTypeActionID", typeof(int));
-            this._dtNotificationTypeActions.Columns.Add("NotificationTypeID", typeof(int));
-            this._dtNotificationTypeActions.Columns.Add("NameResourceKey", typeof(string));
-            this._dtNotificationTypeActions.Columns.Add("DescriptionResourceKey", typeof(string));
-            this._dtNotificationTypeActions.Columns.Add("ConfirmResourceKey", typeof(string));
-            this._dtNotificationTypeActions.Columns.Add("Order", typeof(int));
-            this._dtNotificationTypeActions.Columns.Add("APICall", typeof(string));
-            this._dtNotificationTypeActions.Columns.Add("CreatedByUserID", typeof(int));
-            this._dtNotificationTypeActions.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this._dtNotificationTypeActions.Columns.Add("LastModifiedByUserID", typeof(int));
-            this._dtNotificationTypeActions.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-
-            this._dtNotificationActions = new DataTable();
-            this._dtNotificationActions.Columns.Add("NotificationActionID");
-            this._dtNotificationActions.Columns.Add("MessageID");
-            this._dtNotificationActions.Columns.Add("NotificationTypeActionID");
-            this._dtNotificationActions.Columns.Add("Key");
-            this._dtNotificationActions.Columns.Add("CreatedByUserID", typeof(int));
-            this._dtNotificationActions.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this._dtNotificationActions.Columns.Add("LastModifiedByUserID", typeof(int));
-            this._dtNotificationActions.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-        }
-
-        private class NotificationTypeComparer : IEqualityComparer<NotificationType>
-        {
-            public bool Equals(NotificationType x, NotificationType y)
-            {
-                if (x == null)
-                {
-                    return y == null;
-                }
-
-                if (y == null)
-                {
-                    return false;
-                }
-
-                return
-                    x.NotificationTypeId == y.NotificationTypeId &&
-                    x.Name == y.Name &&
-                    x.Description == y.Description &&
-                    x.TimeToLive == y.TimeToLive &&
-                    x.IsTask == y.IsTask &&
-                    x.DesktopModuleId == y.DesktopModuleId;
-            }
-
-            public int GetHashCode(NotificationType obj)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        private class NotificationTypeActionComparer : IEqualityComparer<NotificationTypeAction>
-        {
-            public bool Equals(NotificationTypeAction x, NotificationTypeAction y)
-            {
-                if (x == null)
-                {
-                    return y == null;
-                }
-
-                if (y == null)
-                {
-                    return false;
-                }
-
-                return
-                    x.NotificationTypeActionId == y.NotificationTypeActionId &&
-                    x.NotificationTypeId == y.NotificationTypeId &&
-                    x.NameResourceKey == y.NameResourceKey &&
-                    x.DescriptionResourceKey == y.DescriptionResourceKey &&
-                    x.ConfirmResourceKey == y.ConfirmResourceKey &&
-                    x.APICall == y.APICall;
-            }
-
-            public int GetHashCode(NotificationTypeAction obj)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        private class NotificationComparer : IEqualityComparer<Notification>
-        {
-            public bool Equals(Notification x, Notification y)
-            {
-                if (x == null)
-                {
-                    return y == null;
-                }
-
-                if (y == null)
-                {
-                    return false;
-                }
-
-                return
-                    x.NotificationID == y.NotificationID &&
-                    x.NotificationTypeID == y.NotificationTypeID &&
-                    x.Subject == y.Subject &&
-                    x.Body == y.Body &&
-                    x.To == y.To &&
-                    x.From == y.From &&
-                    x.SenderUserID == y.SenderUserID &&
-                    x.Context == y.Context &&
-                    x.IncludeDismissAction == y.IncludeDismissAction;
-            }
-
-            public int GetHashCode(Notification obj)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
-
-// ReSharper restore InconsistentNaming
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            ComponentFactory.Container = new SimpleContainer();
+
+            this._mockDataService = new Mock<IDataService>();
+            this._portalController = new Mock<IPortalController>();
+            this._portalGroupController = new Mock<IPortalGroupController>();
+
+            this._mockMessagingDataService = new Mock<DotNetNuke.Services.Social.Messaging.Data.IDataService>();
+            this._dataProvider = MockComponentProvider.CreateDataProvider();
+            this._cachingProvider = MockComponentProvider.CreateDataCacheProvider();
+
+            this._notificationsController = new NotificationsController(this._mockDataService.Object, this._mockMessagingDataService.Object);
+            this._mockNotificationsController = new Mock<NotificationsController> { CallBase = true };
+
+            this._mockMessagingController = new Mock<IMessagingController>();
+            MessagingController.SetTestableInstance(this._mockMessagingController.Object);
+            PortalController.SetTestableInstance(this._portalController.Object);
+            PortalGroupController.RegisterInstance(this._portalGroupController.Object);
+
+            this._mockInternalMessagingController = new Mock<IInternalMessagingController>();
+            InternalMessagingController.SetTestableInstance(this._mockInternalMessagingController.Object);
+
+            DataService.RegisterInstance(this._mockDataService.Object);
+            DotNetNuke.Services.Social.Messaging.Data.DataService.RegisterInstance(this._mockMessagingDataService.Object);
+
+            this.SetupDataProvider();
+            this.SetupDataTables();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            ComponentFactory.Container = null;
+            MessagingController.ClearInstance();
+            PortalController.ClearInstance();
+            InternalMessagingController.ClearInstance();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CreateNotificationType_Throws_On_Null_NotificationType()
+        {
+            this._notificationsController.CreateNotificationType(null);
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase(null)]
+        [ExpectedException(typeof(ArgumentException))]
+        public void CreateNotificationType_Throws_On_Null_Or_Empty_Name(string name)
+        {
+            var notificationType = CreateNewNotificationType();
+            notificationType.Name = name;
+
+            this._notificationsController.CreateNotificationType(notificationType);
+        }
+
+        [Test]
+        public void CreateNotificationType_Calls_DataService_CreateNotificationType()
+        {
+            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
+
+            this._mockDataService
+                .Setup(ds => ds.CreateNotificationType(Constants.Messaging_NotificationTypeName, It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), Constants.UserID_User12, It.IsAny<bool>()))
+                .Verifiable();
+
+            this._mockNotificationsController.Object.CreateNotificationType(CreateNewNotificationType());
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        [TestCase(int.MaxValue, int.MaxValue)]
+        [TestCase(1, 1)]
+        [TestCase(0, 0)]
+        public void CreateNotificationType_Returns_Object_With_Valid_TimeToLive(int actualTimeToLiveTotalMinutes, int expectedTimeToLiveTotalMinutes)
+        {
+            var actualTimeToLive = TimeSpan.FromMinutes(actualTimeToLiveTotalMinutes);
+
+            var notificationType = CreateNewNotificationType();
+            notificationType.TimeToLive = actualTimeToLive;
+            this._notificationsController.CreateNotificationType(notificationType);
+
+            Assert.AreEqual(expectedTimeToLiveTotalMinutes, (int)notificationType.TimeToLive.TotalMinutes);
+        }
+
+        [Test]
+        public void CreateNotificationType_Makes_Valid_Object()
+        {
+            var expectedNotificationType = CreateValidNotificationType();
+
+            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
+
+            this._mockDataService
+                .Setup(ds => ds.CreateNotificationType(
+                    expectedNotificationType.Name,
+                    expectedNotificationType.Description,
+                    (int)expectedNotificationType.TimeToLive.TotalMinutes,
+                    expectedNotificationType.DesktopModuleId,
+                    Constants.UserID_User12, false))
+                .Returns(Constants.Messaging_NotificationTypeId);
+
+            var actualNotificationType = CreateNewNotificationType();
+            this._mockNotificationsController.Object.CreateNotificationType(actualNotificationType);
+
+            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
+        }
+
+        [Test]
+        public void DeleteNotificationType_Calls_DataService_DeleteNotificationType()
+        {
+            this._mockDataService.Setup(ds => ds.DeleteNotificationType(Constants.Messaging_NotificationTypeId)).Verifiable();
+            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeCache());
+            this._mockNotificationsController.Object.DeleteNotificationType(Constants.Messaging_NotificationTypeId);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void DeleteNotificationType_Removes_Cache_Object()
+        {
+            this._mockDataService.Setup(ds => ds.DeleteNotificationType(Constants.Messaging_NotificationTypeId));
+            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeCache()).Verifiable();
+            this._mockNotificationsController.Object.DeleteNotificationType(Constants.Messaging_NotificationTypeId);
+            this._mockNotificationsController.Verify();
+        }
+
+        [Test]
+        public void GetNotificationType_By_Id_Gets_Object_From_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
+            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
+            this._cachingProvider.Verify();
+        }
+
+        [Test]
+        public void GetNotificationType_By_Id_Calls_DataService_GetNotificationType_When_Object_Is_Not_In_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            var messageTypeDataTable = new DataTable();
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationType(Constants.Messaging_NotificationTypeId))
+                .Returns(messageTypeDataTable.CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotificationType_By_Id_Returns_Valid_Object()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            var expectedNotificationType = CreateValidNotificationType();
+
+            this._dtNotificationTypes.Rows.Clear();
+
+            this._dtNotificationTypes.Rows.Add(
+                expectedNotificationType.NotificationTypeId,
+                expectedNotificationType.Name,
+                expectedNotificationType.Description,
+                (int)expectedNotificationType.TimeToLive.TotalMinutes,
+                expectedNotificationType.DesktopModuleId);
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationType(Constants.Messaging_NotificationTypeId))
+                .Returns(this._dtNotificationTypes.CreateDataReader());
+
+            var actualNotificationType = this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeId);
+
+            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void GetNotificationType_By_Name_Throws_On_Null_Or_Empty_Name(string name)
+        {
+            this._notificationsController.GetNotificationType(name);
+        }
+
+        [Test]
+        public void GetNotificationType_By_Name_Gets_Object_From_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
+            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
+            this._cachingProvider.Verify();
+        }
+
+        [Test]
+        public void GetNotificationType_By_Name_Calls_DataService_GetNotificationTypeByName_When_Object_Is_Not_In_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeByName(Constants.Messaging_NotificationTypeName))
+                .Returns(this._dtNotificationTypes.CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotificationType_By_Name_Returns_Valid_Object()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            var expectedNotificationType = CreateValidNotificationType();
+
+            this._dtNotificationTypes.Rows.Clear();
+
+            this._dtNotificationTypes.Rows.Add(
+                expectedNotificationType.NotificationTypeId,
+                expectedNotificationType.Name,
+                expectedNotificationType.Description,
+                (int)expectedNotificationType.TimeToLive.TotalMinutes,
+                expectedNotificationType.DesktopModuleId);
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeByName(Constants.Messaging_NotificationTypeName))
+                .Returns(this._dtNotificationTypes.CreateDataReader());
+
+            var actualNotificationType = this._notificationsController.GetNotificationType(Constants.Messaging_NotificationTypeName);
+
+            Assert.IsTrue(new NotificationTypeComparer().Equals(expectedNotificationType, actualNotificationType));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void SetNotificationTypeActions_Throws_On_Null()
+        {
+            this._notificationsController.SetNotificationTypeActions(null, Constants.Messaging_NotificationTypeId);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SetNotificationTypeActions_Throws_On_EmptyList()
+        {
+            this._notificationsController.SetNotificationTypeActions(new List<NotificationTypeAction>(), Constants.Messaging_NotificationTypeId);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SetNotificationTypeActions_Throws_On_Null_Or_Empty_Name(string name)
+        {
+            var action = CreateNewNotificationTypeAction();
+            action.NameResourceKey = name;
+            this._notificationsController.SetNotificationTypeActions(new[] { action }, Constants.Messaging_NotificationTypeId);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SetNotificationTypeActions_Throws_On_Null_Or_Empty_APICall(string apiCall)
+        {
+            var action = CreateNewNotificationTypeAction();
+            action.APICall = apiCall;
+            this._notificationsController.SetNotificationTypeActions(new[] { action }, Constants.Messaging_NotificationTypeId);
+        }
+
+        [Test]
+        public void SetNotificationTypeActions_Calls_DataService_AddNotificationTypeAction_For_Each_Of_Two_Actions()
+        {
+            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
+
+            // _mockDataService
+            //                .Setup(ds => ds.AddNotificationTypeAction(
+            //                    Constants.Messaging_NotificationTypeId,
+            //                    Constants.Messaging_NotificationTypeActionNameResourceKey,
+            //                    Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
+            //                    Constants.Messaging_NotificationTypeActionConfirmResourceKey,
+            //                    Constants.Messaging_NotificationTypeActionAPICall,
+            //                    Constants.UserID_User12))
+            //                .Verifiable();
+            this._mockNotificationsController.Setup(nc => nc.GetNotificationTypeAction(It.IsAny<int>()));
+
+            this._mockNotificationsController.Object.SetNotificationTypeActions(
+                new[] { CreateNewNotificationTypeAction(), CreateNewNotificationTypeAction() },
+                Constants.Messaging_NotificationTypeId);
+
+            this._mockDataService.Verify(
+                x => x.AddNotificationTypeAction(
+                Constants.Messaging_NotificationTypeId,
+                Constants.Messaging_NotificationTypeActionNameResourceKey,
+                Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
+                Constants.Messaging_NotificationTypeActionConfirmResourceKey,
+                Constants.Messaging_NotificationTypeActionAPICall,
+                Constants.UserID_User12), Times.Exactly(2));
+        }
+
+        [Test]
+        public void SetNotificationTypeActions_Sets_NotificationTypeActionId_And_NotificationTypeId()
+        {
+            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
+
+            this._mockNotificationsController.Setup(nc => nc.GetCurrentUserId()).Returns(Constants.UserID_User12);
+
+            this._mockDataService
+                .Setup(ds => ds.AddNotificationTypeAction(
+                    expectedNotificationTypeAction.NotificationTypeId,
+                    expectedNotificationTypeAction.NameResourceKey,
+                    expectedNotificationTypeAction.DescriptionResourceKey,
+                    expectedNotificationTypeAction.ConfirmResourceKey,
+                    expectedNotificationTypeAction.APICall,
+                    Constants.UserID_User12))
+                .Returns(expectedNotificationTypeAction.NotificationTypeActionId);
+
+            this._mockNotificationsController
+                .Setup(nc => nc.GetNotificationTypeAction(expectedNotificationTypeAction.NotificationTypeActionId))
+                .Returns(expectedNotificationTypeAction);
+
+            var action = CreateNewNotificationTypeAction();
+            this._mockNotificationsController.Object.SetNotificationTypeActions(new[] { action }, expectedNotificationTypeAction.NotificationTypeId);
+
+            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, action));
+        }
+
+        [Test]
+        public void DeleteNotificationTypeAction_Calls_DataService_DeleteNotificationTypeAction()
+        {
+            this._mockDataService.Setup(ds => ds.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId)).Verifiable();
+            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeActionCache());
+            this._mockNotificationsController.Object.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void DeleteNotificationTypeAction_Removes_Cache_Object()
+        {
+            this._mockDataService.Setup(ds => ds.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId));
+            this._mockNotificationsController.Setup(nc => nc.RemoveNotificationTypeActionCache()).Verifiable();
+            this._mockNotificationsController.Object.DeleteNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
+            this._mockNotificationsController.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Id_Gets_Object_From_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
+            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
+            this._cachingProvider.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Id_Calls_DataService_GetNotificationTypeAction_When_Object_Is_Not_In_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId))
+                .Returns(this._dtNotificationTypeActions.CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Id_Returns_Valid_Object()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
+
+            this._dtNotificationTypeActions.Clear();
+
+            this._dtNotificationTypeActions.Rows.Add(
+                expectedNotificationTypeAction.NotificationTypeActionId,
+                expectedNotificationTypeAction.NotificationTypeId,
+                expectedNotificationTypeAction.NameResourceKey,
+                expectedNotificationTypeAction.DescriptionResourceKey,
+                expectedNotificationTypeAction.ConfirmResourceKey,
+                expectedNotificationTypeAction.Order,
+                expectedNotificationTypeAction.APICall);
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId))
+                .Returns(this._dtNotificationTypeActions.CreateDataReader);
+
+            var actualNotificationTypeAction = this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeActionId);
+
+            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeAction));
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void GetNotificationTypeAction_By_Name_Throws_On_Null_Or_Empty_Name(string name)
+        {
+            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, name);
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Name_Gets_Object_From_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+            this._cachingProvider.Setup(cp => cp.GetItem(It.IsAny<string>())).Verifiable();
+            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
+            this._cachingProvider.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Name_Calls_DataService_GetNotificationTypeActionByName_When_Object_Is_Not_In_Cache()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeActionByName(
+                    Constants.Messaging_NotificationTypeId,
+                    Constants.Messaging_NotificationTypeActionNameResourceKey))
+                .Returns(this._dtNotificationTypeActions.CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeAction_By_Name_Returns_Valid_Object()
+        {
+            this._cachingProvider.Object.PurgeCache();
+
+            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
+
+            this._dtNotificationTypeActions.Clear();
+
+            this._dtNotificationTypeActions.Rows.Add(
+                expectedNotificationTypeAction.NotificationTypeActionId,
+                expectedNotificationTypeAction.NotificationTypeId,
+                expectedNotificationTypeAction.NameResourceKey,
+                expectedNotificationTypeAction.DescriptionResourceKey,
+                expectedNotificationTypeAction.ConfirmResourceKey,
+                expectedNotificationTypeAction.Order,
+                expectedNotificationTypeAction.APICall);
+
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeActionByName(
+                    Constants.Messaging_NotificationTypeId,
+                    Constants.Messaging_NotificationTypeActionNameResourceKey))
+                .Returns(this._dtNotificationTypeActions.CreateDataReader());
+
+            var actualNotificationTypeAction = this._notificationsController.GetNotificationTypeAction(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationTypeActionNameResourceKey);
+
+            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeAction));
+        }
+
+        [Test]
+        public void GetNotificationTypeActions_Calls_DataService_GetNotificationTypeActions()
+        {
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId))
+                .Returns(this._dtNotificationTypeActions.CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotificationTypeActions_Returns_Valid_Object()
+        {
+            var expectedNotificationTypeAction = CreateValidNotificationTypeAction();
+
+            this._dtNotificationTypeActions.Clear();
+
+            this._dtNotificationTypeActions.Rows.Add(
+                expectedNotificationTypeAction.NotificationTypeActionId,
+                expectedNotificationTypeAction.NotificationTypeId,
+                expectedNotificationTypeAction.NameResourceKey,
+                expectedNotificationTypeAction.DescriptionResourceKey,
+                expectedNotificationTypeAction.ConfirmResourceKey,
+                expectedNotificationTypeAction.Order,
+                expectedNotificationTypeAction.APICall);
+
+            this._mockDataService.Setup(ds => ds.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId)).Returns(this._dtNotificationTypeActions.CreateDataReader());
+
+            var actualNotificationTypeActions = this._notificationsController.GetNotificationTypeActions(Constants.Messaging_NotificationTypeId);
+
+            Assert.AreEqual(1, actualNotificationTypeActions.Count);
+            Assert.IsTrue(new NotificationTypeActionComparer().Equals(expectedNotificationTypeAction, actualNotificationTypeActions[0]));
+        }
+
+        [Test]
+        public void SendNotification_Sets_Empty_SenderUserId_With_Admin()
+        {
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.CONTENT_ValidPortalId,
+            };
+
+            this._mockNotificationsController.Setup(nc => nc.GetAdminUser()).Returns(adminUser);
+
+            this._mockNotificationsController
+                .Setup(nc => nc.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero,
+                    It.IsAny<IList<RoleInfo>>(),
+                    It.IsAny<IList<UserInfo>>()));
+
+            var notification = CreateUnsavedNotification();
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                new List<RoleInfo>(),
+                new List<UserInfo>());
+
+            Assert.AreEqual(adminUser.UserID, notification.SenderUserID);
+        }
+
+        [Test]
+        [TestCase(null, null)]
+        [TestCase(null, "")]
+        [TestCase("", null)]
+        [TestCase("", "")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SendNotification_Throws_On_Null_Or_Empty_Subject_And_Body(string subject, string body)
+        {
+            var notification = CreateUnsavedNotification();
+            notification.Subject = subject;
+            notification.Body = body;
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                new List<RoleInfo>(),
+                new List<UserInfo>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SendNotification_Throws_On_Null_Roles_And_Users()
+        {
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.SendNotification(
+                CreateUnsavedNotification(),
+                Constants.PORTAL_Zero,
+                null,
+                null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SendNotification_Throws_On_Large_Subject()
+        {
+            var notification = CreateUnsavedNotification();
+            var subject = new StringBuilder();
+            for (var i = 0; i <= 40; i++)
+            {
+                subject.Append("1234567890");
+            }
+
+            notification.Subject = subject.ToString();
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                new List<RoleInfo>(),
+                new List<UserInfo>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SendNotification_Throws_On_Roles_And_Users_With_No_DisplayNames()
+        {
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.SendNotification(
+                CreateUnsavedNotification(),
+                Constants.PORTAL_Zero,
+                new List<RoleInfo>(),
+                new List<UserInfo>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SendNotification_Throws_On_Large_To_List()
+        {
+            var roles = new List<RoleInfo>();
+            var users = new List<UserInfo>();
+
+            for (var i = 0; i <= 100; i++)
+            {
+                roles.Add(new RoleInfo { RoleName = "1234567890" });
+                users.Add(new UserInfo { DisplayName = "1234567890" });
+            }
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.SendNotification(
+                CreateUnsavedNotification(),
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+        }
+
+        [Test]
+        public void SendNotification_Calls_DataService_On_Valid_Notification()
+        {
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.PORTAL_Zero,
+            };
+
+            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            var roles = new List<RoleInfo>();
+            var users = new List<UserInfo>
+                            {
+                                new UserInfo
+                                    {
+                                        UserID = Constants.UserID_User12,
+                                        DisplayName = Constants.UserDisplayName_User12
+                                    },
+                            };
+
+            this._mockDataService
+                .Setup(ds => ds.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero))
+                .Verifiable();
+
+            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
+
+            var notification = CreateUnsavedNotification();
+            notification.SenderUserID = adminUser.UserID;
+            notification.SendToast = false;
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void SendNotification_Calls_DataService_On_Valid_Notification_When_Portal_Is_In_Group()
+        {
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.PORTAL_Zero,
+            };
+
+            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
+            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
+
+            var roles = new List<RoleInfo>();
+            var users = new List<UserInfo>
+                            {
+                                new UserInfo
+                                    {
+                                        UserID = Constants.UserID_User12,
+                                        DisplayName = Constants.UserDisplayName_User12
+                                    },
+                            };
+
+            this._mockDataService
+                .Setup(ds => ds.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero))
+                .Verifiable();
+
+            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
+
+            var notification = CreateUnsavedNotification();
+            notification.SenderUserID = adminUser.UserID;
+            notification.SendToast = false;
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void SendNotification_Calls_Messaging_DataService_CreateSocialMessageRecipientsForRole_When_Passing_Roles()
+        {
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.PORTAL_Zero,
+            };
+
+            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            var roles = new List<RoleInfo>
+                            {
+                                new RoleInfo
+                                    {
+                                        RoleID = Constants.RoleID_RegisteredUsers,
+                                        RoleName = Constants.RoleName_RegisteredUsers
+                                    },
+                            };
+            var users = new List<UserInfo>();
+
+            this._mockDataService
+                .Setup(ds => ds.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero))
+                .Returns(Constants.Messaging_MessageId_1);
+
+            this._mockMessagingDataService
+                .Setup(mds => mds.CreateMessageRecipientsForRole(
+                    Constants.Messaging_MessageId_1,
+                    Constants.RoleID_RegisteredUsers.ToString(CultureInfo.InvariantCulture),
+                    It.IsAny<int>()))
+                .Verifiable();
+
+            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
+
+            var notification = CreateUnsavedNotification();
+            notification.SenderUserID = adminUser.UserID;
+            notification.SendToast = false;
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+
+            this._mockMessagingDataService.Verify();
+        }
+
+        [Test]
+        public void SendNotification_Calls_Messaging_DataService_SaveSocialMessageRecipient_When_Passing_Users()
+        {
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.PORTAL_Zero,
+            };
+
+            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            var roles = new List<RoleInfo>();
+            var users = new List<UserInfo>
+                            {
+                                new UserInfo
+                                    {
+                                        UserID = Constants.UserID_User12,
+                                        DisplayName = Constants.UserDisplayName_User12
+                                    },
+                            };
+
+            this._mockDataService
+                .Setup(ds => ds.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero))
+                .Returns(Constants.Messaging_MessageId_1);
+
+            this._mockInternalMessagingController
+                .Setup(mc => mc.GetMessageRecipient(
+                    Constants.Messaging_MessageId_1,
+                    Constants.UserID_User12))
+                .Returns((MessageRecipient)null);
+
+            this._mockMessagingDataService
+                .Setup(mds => mds.SaveMessageRecipient(
+                    It.Is<MessageRecipient>(mr =>
+                                            mr.MessageID == Constants.Messaging_MessageId_1 &&
+                                            mr.UserID == Constants.UserID_User12 &&
+                                            mr.Read == false &&
+                                            mr.RecipientID == Null.NullInteger),
+                    It.IsAny<int>()))
+                .Verifiable();
+
+            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
+
+            var notification = CreateUnsavedNotification();
+            notification.SenderUserID = adminUser.UserID;
+            notification.SendToast = false;
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+
+            this._mockMessagingDataService.Verify();
+        }
+
+        [Test]
+        public void SendNotification_Returns_Valid_Object()
+        {
+            var expectedNotification = CreateValidNotification();
+
+            var adminUser = new UserInfo
+            {
+                UserID = Constants.UserID_Admin,
+                DisplayName = Constants.UserDisplayName_Admin,
+                PortalID = Constants.PORTAL_Zero,
+            };
+
+            this._mockInternalMessagingController.Setup(mc => mc.RecipientLimit(adminUser.PortalID)).Returns(10);
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            var roles = new List<RoleInfo>();
+            var users = new List<UserInfo>
+                            {
+                                new UserInfo
+                                    {
+                                        UserID = Constants.UserID_User12,
+                                        DisplayName = Constants.UserDisplayName_User12
+                                    },
+                            };
+
+            this._mockDataService
+                .Setup(ds => ds.SendNotification(
+                    It.IsAny<Notification>(),
+                    Constants.PORTAL_Zero))
+                .Returns(Constants.Messaging_MessageId_1);
+
+            this._mockMessagingDataService
+                .Setup(mds => mds.CreateMessageRecipientsForRole(
+                    Constants.Messaging_MessageId_1,
+                    Constants.RoleID_RegisteredUsers.ToString(CultureInfo.InvariantCulture),
+                    It.IsAny<int>()));
+
+            this._mockInternalMessagingController
+                .Setup(mc => mc.GetMessageRecipient(
+                    Constants.Messaging_MessageId_1,
+                    Constants.UserID_User12))
+                .Returns((MessageRecipient)null);
+
+            this._mockMessagingDataService
+                .Setup(mds => mds.SaveMessageRecipient(
+                    It.Is<MessageRecipient>(mr =>
+                                            mr.MessageID == Constants.Messaging_MessageId_1 &&
+                                            mr.UserID == Constants.UserID_User12 &&
+                                            mr.Read == false &&
+                                            mr.RecipientID == Null.NullInteger),
+                    It.IsAny<int>()));
+
+            this._mockNotificationsController.Setup(nc => nc.GetExpirationDate(It.IsAny<int>())).Returns(DateTime.MinValue);
+
+            var notification = CreateUnsavedNotification();
+            notification.SenderUserID = adminUser.UserID;
+            notification.SendToast = false;
+
+            this._mockNotificationsController.Object.SendNotification(
+                notification,
+                Constants.PORTAL_Zero,
+                roles,
+                users);
+
+            Assert.IsTrue(new NotificationComparer().Equals(expectedNotification, notification));
+        }
+
+        [Test]
+        public void DeleteNotification_Calls_DataService_DeleteNotification()
+        {
+            var messageRecipients = new List<MessageRecipient>
+                                        {
+                                            new MessageRecipient(),
+                                        };
+
+            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(messageRecipients);
+
+            this._mockDataService.Setup(ds => ds.DeleteNotification(Constants.Messaging_MessageId_1)).Verifiable();
+            this._notificationsController.DeleteNotification(Constants.Messaging_MessageId_1);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotifications_Calls_DataService_GetNotifications()
+        {
+            this._mockDataService
+                .Setup(ds => ds.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, It.IsAny<int>(), It.IsAny<int>()))
+                .Returns(new DataTable().CreateDataReader())
+                .Verifiable();
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            this._notificationsController.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, 0, 10);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotifications_Calls_DataService_GetNotifications_When_Portal_Is_In_Group()
+        {
+            this._mockDataService
+                .Setup(ds => ds.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, It.IsAny<int>(), It.IsAny<int>()))
+                .Returns(new DataTable().CreateDataReader())
+                .Verifiable();
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
+            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
+
+            this._notificationsController.GetNotifications(Constants.UserID_User12, Constants.PORTAL_Zero, 0, 10);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void GetNotifications_Calls_DataService_GetNotificationByContext()
+        {
+            this._mockDataService
+                .Setup(ds => ds.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext))
+                .Returns(new DataTable().CreateDataReader())
+                .Verifiable();
+
+            this._notificationsController.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void CountNotifications_Calls_DataService_CountNotifications()
+        {
+            this._mockDataService.Setup(ds => ds.CountNotifications(Constants.UserID_User12, Constants.PORTAL_Zero)).Verifiable();
+            this._notificationsController.CountNotifications(Constants.UserID_User12, Constants.PORTAL_Zero);
+            this._mockDataService.Verify();
+        }
+
+        [Test]
+        public void DeleteNotificationRecipient_Calls_MessagingController_DeleteMessageRecipient()
+        {
+            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12)).Verifiable();
+            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
+            this._notificationsController.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
+            this._mockMessagingController.Verify();
+        }
+
+        [Test]
+        public void DeleteNotificationRecipientByContext_Calls_DeleteMessageRecipient()
+        {
+            this._mockNotificationsController.Setup(mc => mc.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12)).Verifiable();
+            this._mockNotificationsController.Setup(mc => mc.GetNotificationByContext(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext))
+                .Returns(new List<Notification> { new Notification { NotificationID = Constants.Messaging_MessageId_1 } });
+            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_NotificationTypeId, Constants.Messaging_NotificationContext, Constants.UserID_User12);
+            this._mockMessagingController.Verify();
+        }
+
+        [Test]
+        public void DeleteNotificationRecipient_Does_Not_Delete_Notification_When_There_Are_More_Recipients()
+        {
+            var messageRecipients = new List<MessageRecipient>
+                                        {
+                                            new MessageRecipient(),
+                                        };
+
+            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12));
+            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(messageRecipients);
+            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
+
+            this._mockNotificationsController.Verify(nc => nc.DeleteNotification(Constants.Messaging_MessageId_1), Times.Never());
+        }
+
+        [Test]
+        public void DeleteNotificationRecipient_Deletes_Notification_When_There_Are_No_More_Recipients()
+        {
+            this._mockInternalMessagingController.Setup(mc => mc.DeleteMessageRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12));
+            this._mockInternalMessagingController.Setup(mc => mc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
+            this._mockNotificationsController.Object.DeleteNotificationRecipient(Constants.Messaging_MessageId_1, Constants.UserID_User12);
+            this._mockNotificationsController.Verify(nc => nc.DeleteNotification(Constants.Messaging_MessageId_1));
+        }
+
+        [Test]
+        public void DeleteAllNotificationRecipients_Calls_DeleteNotificationRecipient_For_Each_Recipient()
+        {
+            var recipients = new List<MessageRecipient>
+                                 {
+                                     new MessageRecipient { RecipientID = Constants.Messaging_RecipientId_1 },
+                                     new MessageRecipient { RecipientID = Constants.Messaging_RecipientId_2 },
+                                 };
+
+            this._mockInternalMessagingController.Setup(imc => imc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(recipients);
+
+            this._mockNotificationsController.Object.DeleteAllNotificationRecipients(Constants.Messaging_MessageId_1);
+
+            this._mockNotificationsController.Verify(nc => nc.DeleteNotificationRecipient(It.IsAny<int>(), It.IsAny<int>()), Times.Exactly(2));
+        }
+
+        [Test]
+        public void DeleteAllNotificationRecipients_Does_Not_Call_DeleteNotificationRecipient_When_Notification_Has_No_Recipients()
+        {
+            this._mockInternalMessagingController.Setup(imc => imc.GetMessageRecipients(Constants.Messaging_MessageId_1)).Returns(new List<MessageRecipient>());
+            this._mockNotificationsController.Object.DeleteAllNotificationRecipients(Constants.Messaging_MessageId_1);
+            this._mockNotificationsController.Verify(nc => nc.DeleteNotificationRecipient(It.IsAny<int>(), It.IsAny<int>()), Times.Never());
+        }
+
+        private static Notification CreateUnsavedNotification()
+        {
+            return new Notification
+            {
+                NotificationTypeID = Constants.Messaging_NotificationTypeId,
+                Subject = Constants.Messaging_NotificationSubject,
+                Body = Constants.Messaging_NotificationBody,
+                To = Constants.UserDisplayName_User12,
+                From = Constants.UserDisplayName_Admin,
+                SenderUserID = Constants.UserID_Admin,
+                Context = Constants.Messaging_NotificationContext,
+                SendToast = false,
+            };
+        }
+
+        private static Notification CreateValidNotification()
+        {
+            var notification = CreateUnsavedNotification();
+            notification.NotificationID = Constants.Messaging_MessageId_1;
+
+            return notification;
+        }
+
+        private static NotificationType CreateValidNotificationType()
+        {
+            var nt = CreateNewNotificationType();
+            nt.NotificationTypeId = Constants.Messaging_NotificationTypeId;
+            return nt;
+        }
+
+        private static NotificationType CreateNewNotificationType()
+        {
+            return new NotificationType
+            {
+                Name = Constants.Messaging_NotificationTypeName,
+                Description = Constants.Messaging_NotificationTypeDescription,
+                TimeToLive = new TimeSpan(0, Constants.Messaging_NotificationTypeTTL, 0),
+                DesktopModuleId = Constants.Messaging_NotificationTypeDesktopModuleId,
+                IsTask = false,
+            };
+        }
+
+        private static NotificationTypeAction CreateValidNotificationTypeAction()
+        {
+            var action = CreateNewNotificationTypeAction();
+
+            action.NotificationTypeActionId = Constants.Messaging_NotificationTypeActionId;
+            action.NotificationTypeId = Constants.Messaging_NotificationTypeId;
+
+            return action;
+        }
+
+        private static NotificationTypeAction CreateNewNotificationTypeAction()
+        {
+            return new NotificationTypeAction
+            {
+                APICall = Constants.Messaging_NotificationTypeActionAPICall,
+                ConfirmResourceKey = Constants.Messaging_NotificationTypeActionConfirmResourceKey,
+                DescriptionResourceKey = Constants.Messaging_NotificationTypeActionDescriptionResourceKey,
+                NameResourceKey = Constants.Messaging_NotificationTypeActionNameResourceKey,
+            };
+        }
+
+        private static PortalInfo CreatePortalInfo(int portalId, int portalGroupId)
+        {
+            var mockPortalInfo = new PortalInfo { PortalID = portalId, PortalGroupID = portalGroupId };
+            return mockPortalInfo;
+        }
+
+        private static PortalGroupInfo CreatePortalGroupInfo(int portalGroupId, int masterPortalId)
+        {
+            var mockPortalGroupInfo = new PortalGroupInfo
+            {
+                PortalGroupId = portalGroupId,
+                MasterPortalId = masterPortalId,
+                PortalGroupName = Constants.PORTALGROUP_ValidName,
+                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
+            };
+
+            return mockPortalGroupInfo;
+        }
+
+        private void SetupDataProvider()
+        {
+            // Standard DataProvider Path for Logging
+            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+        }
+
+        private void SetupDataTables()
+        {
+            this._dtNotificationTypes = new DataTable();
+            this._dtNotificationTypes.Columns.Add("NotificationTypeID", typeof(int));
+            this._dtNotificationTypes.Columns.Add("Name", typeof(string));
+            this._dtNotificationTypes.Columns.Add("Description", typeof(string));
+            this._dtNotificationTypes.Columns.Add("TTL", typeof(int));
+            this._dtNotificationTypes.Columns.Add("DesktopModuleID", typeof(int));
+            this._dtNotificationTypes.Columns.Add("CreatedByUserID", typeof(int));
+            this._dtNotificationTypes.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this._dtNotificationTypes.Columns.Add("LastModifiedByUserID", typeof(int));
+            this._dtNotificationTypes.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+            this._dtNotificationTypes.Columns.Add("IsTask", typeof(bool));
+
+            this._dtNotificationTypeActions = new DataTable();
+            this._dtNotificationTypeActions.Columns.Add("NotificationTypeActionID", typeof(int));
+            this._dtNotificationTypeActions.Columns.Add("NotificationTypeID", typeof(int));
+            this._dtNotificationTypeActions.Columns.Add("NameResourceKey", typeof(string));
+            this._dtNotificationTypeActions.Columns.Add("DescriptionResourceKey", typeof(string));
+            this._dtNotificationTypeActions.Columns.Add("ConfirmResourceKey", typeof(string));
+            this._dtNotificationTypeActions.Columns.Add("Order", typeof(int));
+            this._dtNotificationTypeActions.Columns.Add("APICall", typeof(string));
+            this._dtNotificationTypeActions.Columns.Add("CreatedByUserID", typeof(int));
+            this._dtNotificationTypeActions.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this._dtNotificationTypeActions.Columns.Add("LastModifiedByUserID", typeof(int));
+            this._dtNotificationTypeActions.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+
+            this._dtNotificationActions = new DataTable();
+            this._dtNotificationActions.Columns.Add("NotificationActionID");
+            this._dtNotificationActions.Columns.Add("MessageID");
+            this._dtNotificationActions.Columns.Add("NotificationTypeActionID");
+            this._dtNotificationActions.Columns.Add("Key");
+            this._dtNotificationActions.Columns.Add("CreatedByUserID", typeof(int));
+            this._dtNotificationActions.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this._dtNotificationActions.Columns.Add("LastModifiedByUserID", typeof(int));
+            this._dtNotificationActions.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+        }
+
+        private class NotificationTypeComparer : IEqualityComparer<NotificationType>
+        {
+            public bool Equals(NotificationType x, NotificationType y)
+            {
+                if (x == null)
+                {
+                    return y == null;
+                }
+
+                if (y == null)
+                {
+                    return false;
+                }
+
+                return
+                    x.NotificationTypeId == y.NotificationTypeId &&
+                    x.Name == y.Name &&
+                    x.Description == y.Description &&
+                    x.TimeToLive == y.TimeToLive &&
+                    x.IsTask == y.IsTask &&
+                    x.DesktopModuleId == y.DesktopModuleId;
+            }
+
+            public int GetHashCode(NotificationType obj)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class NotificationTypeActionComparer : IEqualityComparer<NotificationTypeAction>
+        {
+            public bool Equals(NotificationTypeAction x, NotificationTypeAction y)
+            {
+                if (x == null)
+                {
+                    return y == null;
+                }
+
+                if (y == null)
+                {
+                    return false;
+                }
+
+                return
+                    x.NotificationTypeActionId == y.NotificationTypeActionId &&
+                    x.NotificationTypeId == y.NotificationTypeId &&
+                    x.NameResourceKey == y.NameResourceKey &&
+                    x.DescriptionResourceKey == y.DescriptionResourceKey &&
+                    x.ConfirmResourceKey == y.ConfirmResourceKey &&
+                    x.APICall == y.APICall;
+            }
+
+            public int GetHashCode(NotificationTypeAction obj)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class NotificationComparer : IEqualityComparer<Notification>
+        {
+            public bool Equals(Notification x, Notification y)
+            {
+                if (x == null)
+                {
+                    return y == null;
+                }
+
+                if (y == null)
+                {
+                    return false;
+                }
+
+                return
+                    x.NotificationID == y.NotificationID &&
+                    x.NotificationTypeID == y.NotificationTypeID &&
+                    x.Subject == y.Subject &&
+                    x.Body == y.Body &&
+                    x.To == y.To &&
+                    x.From == y.From &&
+                    x.SenderUserID == y.SenderUserID &&
+                    x.Context == y.Context &&
+                    x.IncludeDismissAction == y.IncludeDismissAction;
+            }
+
+            public int GetHashCode(Notification obj)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
+
+// ReSharper restore InconsistentNaming
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/SubscriptionTypeControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/SubscriptionTypeControllerTests.cs
index 81022007ee8..380de00282e 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/SubscriptionTypeControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Messaging/SubscriptionTypeControllerTests.cs	
@@ -2,180 +2,195 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Messaging
-{
-    using System;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Social.Subscriptions;
-    using DotNetNuke.Services.Social.Subscriptions.Data;
-    using DotNetNuke.Tests.Core.Controllers.Messaging.Builders;
-    using DotNetNuke.Tests.Core.Controllers.Messaging.Mocks;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class SubscriptionTypeControllerTests
-    {
-        private const string SubscriptionTypesCacheKey = "DNN_" + DataCache.SubscriptionTypesCacheKey;
-
-        private SubscriptionTypeController subscriptionTypeController;
-        private Mock<IDataService> mockDataService;
-        private Mock<CachingProvider> mockCacheProvider;
-
-        [SetUp]
-        public void SetUp()
-        {
-            // Setup Mocks and Stub
-            this.mockDataService = new Mock<IDataService>();
-            this.mockCacheProvider = MockComponentProvider.CreateDataCacheProvider();
-
-            DataService.SetTestableInstance(this.mockDataService.Object);
-
-            // Setup SUT
-            this.subscriptionTypeController = new SubscriptionTypeController();
-        }
-
-        [Test]
-        public void GetSubscriptionTypes_ShouldCallDataService_WhenNoError()
-        {
-            // Arrange
-            var mockHostController = new Mock<IHostController>();
-            mockHostController
-                .Setup(c => c.GetString("PerformanceSetting"))
-                .Returns("0");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            this.mockDataService
-                .Setup(ds => ds.GetSubscriptionTypes())
-                .Returns(SubscriptionTypeDataReaderMockHelper.CreateEmptySubscriptionTypeReader())
-                .Verifiable();
-
-            // Act
-            this.subscriptionTypeController.GetSubscriptionTypes();
-
-            // Assert
-            this.mockDataService.Verify(ds => ds.GetSubscriptionTypes(), Times.Once());
-        }
-
-        [Test]
-        public void GetSubscriptionTypes_ShouldThrowArgumentNullException_WhenPredicateIsNull()
-        {
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.GetSubscriptionTypes(null));
-        }
-
-        [Test]
-        public void GetSubscriptionType_ShouldThrowArgumentNullException_WhenPredicateIsNull()
-        {
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.GetSubscriptionType(null));
-        }
-
-        [Test]
-        public void AddSubscriptionType_ShouldThrowArgumentNullException_WhenSubscriptionTypeIsNull()
-        {
-            // Act, Arrange
-            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.AddSubscriptionType(null));
-        }
-
-        [Test]
-        public void AddSubscriptionType_ShouldFilledUpTheSubscriptionTypeIdPropertyOfTheInputSubscriptionTypeEntity_WhenNoError()
-        {
-            // Arrange
-            const int expectedSubscriptionTypeId = 12;
-            var subscriptionType = new SubscriptionTypeBuilder().Build();
-
-            this.mockDataService
-                .Setup(ds => ds.AddSubscriptionType(
-                    subscriptionType.SubscriptionName,
-                    subscriptionType.FriendlyName,
-                    subscriptionType.DesktopModuleId))
-                .Returns(expectedSubscriptionTypeId);
-
-            // Act
-            this.subscriptionTypeController.AddSubscriptionType(subscriptionType);
-
-            // Assert
-            Assert.AreEqual(expectedSubscriptionTypeId, subscriptionType.SubscriptionTypeId);
-        }
-
-        [Test]
-        public void AddSubscriptionType_ShouldCleanCache_WhenNoError()
-        {
-            // Arrange
-            this.mockDataService.Setup(ds => ds.AddSubscriptionType(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()));
-            this.mockCacheProvider.Setup(cp => cp.Remove(SubscriptionTypesCacheKey)).Verifiable();
-
-            var subscriptionType = new SubscriptionTypeBuilder().Build();
-
-            // Act
-            this.subscriptionTypeController.AddSubscriptionType(subscriptionType);
-
-            // Assert
-            this.mockCacheProvider.Verify(cp => cp.Remove(SubscriptionTypesCacheKey), Times.Once());
-        }
-
-        [Test]
-        public void DeleteSubscriptionType_ShouldThrowArgumentOutOfRangeException_WhenSubscriptionTypeIdIsNegative()
-        {
-            // Arrange
-            var subscriptionType = new SubscriptionTypeBuilder()
-                .WithSubscriptionTypeId(-1)
-                .Build();
-
-            // Act, Assert
-            Assert.Throws<ArgumentOutOfRangeException>(() => this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType));
-        }
-
-        [Test]
-        public void DeleteSubscriptionType_ShouldThrowNullArgumentException_WhenSubscriptionTypeIsNull()
-        {
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.DeleteSubscriptionType(null));
-        }
-
-        [Test]
-        public void DeleteSubscriptionType_ShouldCallDataService_WhenNoError()
-        {
-            // Arrange
-            var subscriptionType = new SubscriptionTypeBuilder().Build();
-
-            this.mockDataService
-                .Setup(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId))
-                .Verifiable();
-
-            // Act
-            this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType);
-
-            // Assert
-            this.mockDataService.Verify(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId), Times.Once());
-        }
-
-        [Test]
-        public void DeleteSubscriptionType_ShouldCleanCache_WhenNoError()
-        {
-            // Arrange
-            var subscriptionType = new SubscriptionTypeBuilder().Build();
-
-            this.mockDataService.Setup(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId));
-            this.mockCacheProvider.Setup(cp => cp.Remove(SubscriptionTypesCacheKey)).Verifiable();
-
-            // Act
-            this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType);
-
-            // Assert
-            this.mockCacheProvider.Verify(cp => cp.Remove(SubscriptionTypesCacheKey), Times.Once());
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            DataService.ClearInstance();
-            MockComponentProvider.ResetContainer();
-        }
-    }
-}
+namespace DotNetNuke.Tests.Core.Controllers.Messaging
+{
+    using System;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Social.Subscriptions;
+    using DotNetNuke.Services.Social.Subscriptions.Data;
+    using DotNetNuke.Tests.Core.Controllers.Messaging.Builders;
+    using DotNetNuke.Tests.Core.Controllers.Messaging.Mocks;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class SubscriptionTypeControllerTests
+    {
+        private const string SubscriptionTypesCacheKey = "DNN_" + DataCache.SubscriptionTypesCacheKey;
+
+        private SubscriptionTypeController subscriptionTypeController;
+        private Mock<IDataService> mockDataService;
+        private Mock<CachingProvider> mockCacheProvider;
+        private Mock<IHostController> mockHostController;
+
+        [SetUp]
+        public void SetUp()
+        {
+            // Setup Mocks and Stub
+            this.mockDataService = new Mock<IDataService>();
+            this.mockCacheProvider = MockComponentProvider.CreateDataCacheProvider();
+            this.mockHostController = new Mock<IHostController>();
+            this.mockHostController.As<IHostSettingsService>();
+
+            DataService.SetTestableInstance(this.mockDataService.Object);
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            // Setup SUT
+            this.subscriptionTypeController = new SubscriptionTypeController();
+        }
+
+        [Test]
+        public void GetSubscriptionTypes_ShouldCallDataService_WhenNoError()
+        {
+            // Arrange
+            this.mockHostController
+                .Setup(c => c.GetString("PerformanceSetting"))
+                .Returns("0");
+
+            this.mockDataService
+                .Setup(ds => ds.GetSubscriptionTypes())
+                .Returns(SubscriptionTypeDataReaderMockHelper.CreateEmptySubscriptionTypeReader())
+                .Verifiable();
+
+            // Act
+            this.subscriptionTypeController.GetSubscriptionTypes();
+
+            // Assert
+            this.mockDataService.Verify(ds => ds.GetSubscriptionTypes(), Times.Once());
+        }
+
+        [Test]
+        public void GetSubscriptionTypes_ShouldThrowArgumentNullException_WhenPredicateIsNull()
+        {
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.GetSubscriptionTypes(null));
+        }
+
+        [Test]
+        public void GetSubscriptionType_ShouldThrowArgumentNullException_WhenPredicateIsNull()
+        {
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.GetSubscriptionType(null));
+        }
+
+        [Test]
+        public void AddSubscriptionType_ShouldThrowArgumentNullException_WhenSubscriptionTypeIsNull()
+        {
+            // Act, Arrange
+            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.AddSubscriptionType(null));
+        }
+
+        [Test]
+        public void AddSubscriptionType_ShouldFilledUpTheSubscriptionTypeIdPropertyOfTheInputSubscriptionTypeEntity_WhenNoError()
+        {
+            // Arrange
+            const int expectedSubscriptionTypeId = 12;
+            var subscriptionType = new SubscriptionTypeBuilder().Build();
+
+            this.mockDataService
+                .Setup(ds => ds.AddSubscriptionType(
+                    subscriptionType.SubscriptionName,
+                    subscriptionType.FriendlyName,
+                    subscriptionType.DesktopModuleId))
+                .Returns(expectedSubscriptionTypeId);
+
+            // Act
+            this.subscriptionTypeController.AddSubscriptionType(subscriptionType);
+
+            // Assert
+            Assert.AreEqual(expectedSubscriptionTypeId, subscriptionType.SubscriptionTypeId);
+        }
+
+        [Test]
+        public void AddSubscriptionType_ShouldCleanCache_WhenNoError()
+        {
+            // Arrange
+            this.mockDataService.Setup(ds => ds.AddSubscriptionType(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()));
+            this.mockCacheProvider.Setup(cp => cp.Remove(SubscriptionTypesCacheKey)).Verifiable();
+
+            var subscriptionType = new SubscriptionTypeBuilder().Build();
+
+            // Act
+            this.subscriptionTypeController.AddSubscriptionType(subscriptionType);
+
+            // Assert
+            this.mockCacheProvider.Verify(cp => cp.Remove(SubscriptionTypesCacheKey), Times.Once());
+        }
+
+        [Test]
+        public void DeleteSubscriptionType_ShouldThrowArgumentOutOfRangeException_WhenSubscriptionTypeIdIsNegative()
+        {
+            // Arrange
+            var subscriptionType = new SubscriptionTypeBuilder()
+                .WithSubscriptionTypeId(-1)
+                .Build();
+
+            // Act, Assert
+            Assert.Throws<ArgumentOutOfRangeException>(() => this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType));
+        }
+
+        [Test]
+        public void DeleteSubscriptionType_ShouldThrowNullArgumentException_WhenSubscriptionTypeIsNull()
+        {
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => this.subscriptionTypeController.DeleteSubscriptionType(null));
+        }
+
+        [Test]
+        public void DeleteSubscriptionType_ShouldCallDataService_WhenNoError()
+        {
+            // Arrange
+            var subscriptionType = new SubscriptionTypeBuilder().Build();
+
+            this.mockDataService
+                .Setup(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId))
+                .Verifiable();
+
+            // Act
+            this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType);
+
+            // Assert
+            this.mockDataService.Verify(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId), Times.Once());
+        }
+
+        [Test]
+        public void DeleteSubscriptionType_ShouldCleanCache_WhenNoError()
+        {
+            // Arrange
+            var subscriptionType = new SubscriptionTypeBuilder().Build();
+
+            this.mockDataService.Setup(ds => ds.DeleteSubscriptionType(subscriptionType.SubscriptionTypeId));
+            this.mockCacheProvider.Setup(cp => cp.Remove(SubscriptionTypesCacheKey)).Verifiable();
+
+            // Act
+            this.subscriptionTypeController.DeleteSubscriptionType(subscriptionType);
+
+            // Assert
+            this.mockCacheProvider.Verify(cp => cp.Remove(SubscriptionTypesCacheKey), Times.Once());
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            DataService.ClearInstance();
+            MockComponentProvider.ResetContainer();
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Portal/PortalGroupControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Portal/PortalGroupControllerTests.cs
index 824af839ab3..f4c79d823ca 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Portal/PortalGroupControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Portal/PortalGroupControllerTests.cs	
@@ -2,520 +2,535 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Portal
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.Linq;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Portals.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Tests.Utilities;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    // ReSharper disable InconsistentNaming
-    [TestFixture]
-    public class PortalGroupControllerTests
-    {
-        private Mock<DataProvider> _mockData;
-#pragma warning disable 649
-        private UserCopiedCallback userCopied;
-#pragma warning restore 649
-
-        [SetUp]
-        public void SetUp()
-        {
-            this._mockData = MockComponentProvider.CreateDataProvider();
-            DataTable hostSettingsTable = new DataTable("HostSettings");
-
-            var nameCol = hostSettingsTable.Columns.Add("SettingName");
-            hostSettingsTable.Columns.Add("SettingValue");
-            hostSettingsTable.Columns.Add("SettingIsSecure");
-            hostSettingsTable.PrimaryKey = new[] { nameCol };
-
-            hostSettingsTable.Rows.Add("PerformanceSetting", "0", false);
-            this._mockData.Setup(c => c.GetHostSettings()).Returns(hostSettingsTable.CreateDataReader());
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            MockComponentProvider.ResetContainer();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_Constructor_Throws_On_Null_DataService()
-        {
-            // Arrange
-            var mockPortalController = new Mock<IPortalController>();
-
-            // Act, Assert
-            new PortalGroupController(null, mockPortalController.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_Constructor_Throws_On_Null_PortalController()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-
-            // Act, Assert
-            new PortalGroupController(mockDataService.Object, null);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_AddPortalToGroup_Throws_On_Null_PortalGroup()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
-
-            // Act, Assert
-            controller.AddPortalToGroup(portal, null, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_AddPortalToGroup_Throws_On_Null_Portal()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-            var portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
-
-            // Act, Assert
-            controller.AddPortalToGroup(null, portalGroup, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void PortalGroupController_AddPortalToGroup_Throws_On_Negative_PortalGroupId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
-
-            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = -1 };
-
-            // Act, Assert
-            controller.AddPortalToGroup(portal, portalGroup, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void PortalGroupController_AddPortalToGroup_Throws_On_Negative_PortalId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portal = new PortalInfo { PortalID = -1 };
-
-            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
-
-            // Act, Assert
-            controller.AddPortalToGroup(portal, portalGroup, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_AddPortalGroup_Throws_On_Null_PortalGroup()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act, Assert
-            controller.AddPortalGroup(null);
-        }
-
-        [Test]
-        public void PortalGroupController_AddPortalGroup_Calls_DataService_On_Valid_Arguments()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
-
-            // Act
-            controller.AddPortalGroup(portalGroup);
-
-            // Assert
-            mockDataService.Verify(ds => ds.AddPortalGroup(portalGroup, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void PortalGroupController_AddPortalGroup_Calls_PortalController_On_Valid_Arguments()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            var masterPortal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
-            var mockPortalController = new Mock<IPortalController>();
-            mockPortalController.Setup(pc => pc.GetPortal(Constants.PORTAL_ValidPortalId))
-                        .Returns(masterPortal);
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
-
-            // Act
-            controller.AddPortalGroup(portalGroup);
-
-            // Assert
-            mockPortalController.Verify(pc => pc.GetPortal(portalGroup.MasterPortalId));
-            mockPortalController.Verify(pc => pc.UpdatePortalInfo(masterPortal));
-        }
-
-        [Test]
-        public void PortalGroupController_AddPortalGroup_Returns_ValidId_On_Valid_PortalGroup()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddPortalGroup(It.IsAny<PortalGroupInfo>(), It.IsAny<int>())).Returns(Constants.PORTALGROUP_AddPortalGroupId);
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
-
-            // Act
-            int portalGroupId = controller.AddPortalGroup(portalGroup);
-
-            // Assert
-            Assert.AreEqual(Constants.PORTALGROUP_AddPortalGroupId, portalGroupId);
-        }
-
-        [Test]
-        public void PortalGroupController_AddPortalGroup_Sets_PortalGroupId_Property_On_Valid_PortalGroup()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.AddPortalGroup(It.IsAny<PortalGroupInfo>(), It.IsAny<int>())).Returns(Constants.PORTALGROUP_AddPortalGroupId);
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
-
-            // Act
-            controller.AddPortalGroup(portalGroup);
-
-            // Assert
-            Assert.AreEqual(Constants.PORTALGROUP_AddPortalGroupId, portalGroup.PortalGroupId);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_DeletePortalGroup_Throws_On_Null_PortalGroup()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act, Assert
-            controller.DeletePortalGroup(null);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void PortalGroupController_DeletePortalGroup_Throws_On_Negative_PortalGroupId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Null.NullInteger;
-
-            // Act, Assert
-            controller.DeletePortalGroup(portalGroup);
-        }
-
-        [Test]
-        public void PortalGroupController_DeletePortalGroup_Calls_DataService_On_Valid_PortalGroupId()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            PortalGroupInfo portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_DeletePortalGroupId;
-
-            // Act
-            controller.DeletePortalGroup(portalGroup);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeletePortalGroup(portalGroup));
-        }
-
-        [Test]
-
-        public void PortalGroupController_GetPortalGroups_Calls_DataService()
-        {
-            // Arrange
-            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
-
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(0, Constants.USER_ValidId));
-
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act
-            controller.GetPortalGroups();
-
-            // Assert
-            mockDataService.Verify(ds => ds.GetPortalGroups());
-        }
-
-        [Test]
-        public void PortalGroupController_GetPortalGroups_Returns_EmptyList_If_No_Items()
-        {
-            // Arrange
-            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
-
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(0, Constants.USER_ValidId));
-
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act
-            IEnumerable<PortalGroupInfo> portalGroups = controller.GetPortalGroups();
-
-            // Assert
-            Assert.AreEqual(0, portalGroups.Count());
-        }
-
-        [Test]
-        public void PortalGroupController_GetPortalGroups_Returns_List_Of_PortalGroups()
-        {
-            // Arrange
-            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
-            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
-
-            Mock<IDataService> mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(
-                Constants.PORTALGROUP_ValidPortalGroupCount,
-                Constants.USER_ValidId));
-
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act
-            IEnumerable<PortalGroupInfo> portalGroups = controller.GetPortalGroups();
-
-            // Assert
-            Assert.AreEqual(Constants.PORTALGROUP_ValidPortalGroupCount, portalGroups.Count());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Null_PortalGroup()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
-
-            // Act, Assert
-            controller.RemovePortalFromGroup(portal, null, false, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Null_Portal()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-            var portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
-
-            // Act, Assert
-            controller.RemovePortalFromGroup(null, portalGroup, false, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Negative_PortalGroupId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
-
-            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = -1 };
-
-            // Act, Assert
-            controller.RemovePortalFromGroup(portal, portalGroup, false, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Negative_PortalId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portal = new PortalInfo { PortalID = -1 };
-
-            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
-
-            // Act, Assert
-            controller.RemovePortalFromGroup(portal, portalGroup, false, this.userCopied);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void PortalGroupController_UpdatePortalGroup_Throws_On_Null_PortalGroup()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            // Act, Assert
-            controller.UpdatePortalGroup(null);
-        }
-
-        [Test]
-        public void PortalGroupController_UpdatePortalGroup_Throws_On_Negative_PortalGroupId()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portalGroup = new PortalGroupInfo();
-            portalGroup.PortalGroupId = Null.NullInteger;
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => controller.UpdatePortalGroup(portalGroup));
-        }
-
-        [Test]
-        public void PortalGroupController_UpdatePortalGroup_Calls_DataService_On_Valid_PortalGroup()
-        {
-            // Arrange
-            MockComponentProvider.CreateNew<CachingProvider>();
-            var mockDataService = new Mock<IDataService>();
-            var mockPortalController = new Mock<IPortalController>();
-            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
-
-            var portalGroup = CreateValidPortalGroup();
-            portalGroup.PortalGroupId = Constants.PORTALGROUP_UpdatePortalGroupId;
-            portalGroup.PortalGroupName = Constants.PORTALGROUP_UpdateName;
-            portalGroup.PortalGroupDescription = Constants.PORTALGROUP_UpdateDescription;
-
-            // Act
-            controller.UpdatePortalGroup(portalGroup);
-
-            // Assert
-            mockDataService.Verify(ds => ds.UpdatePortalGroup(portalGroup, It.IsAny<int>()));
-        }
-
-        private static DataTable CreatePortalGroupTable()
-        {
-            // Create Categories table.
-            DataTable table = new DataTable();
-
-            // Create columns, ID and Name.
-            DataColumn idColumn = table.Columns.Add("PortalGroupID", typeof(int));
-            table.Columns.Add("MasterPortalID", typeof(int));
-            table.Columns.Add("PortalGroupName", typeof(string));
-            table.Columns.Add("PortalGroupDescription", typeof(string));
-            table.Columns.Add("AuthenticationDomain", typeof(string));
-            table.Columns.Add("CreatedByUserID", typeof(int));
-            table.Columns.Add("CreatedOnDate", typeof(DateTime));
-            table.Columns.Add("LastModifiedByUserID", typeof(int));
-            table.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-
-            // Set the ID column as the primary key column.
-            table.PrimaryKey = new[] { idColumn };
-
-            return table;
-        }
-
-        private static string GetName(int i)
-        {
-            return string.Format(string.Format(Constants.PORTALGROUP_ValidNameFormat, i));
-        }
-
-        private static string GetDescription(int i)
-        {
-            return string.Format(string.Format(Constants.PORTALGROUP_ValidDescriptionFormat, i));
-        }
-
-        private static PortalGroupInfo CreateValidPortalGroup()
-        {
-            var portalGroup = new PortalGroupInfo
-            {
-                PortalGroupName = Constants.PORTALGROUP_ValidName,
-                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
-                MasterPortalId = Constants.PORTAL_ValidPortalId,
-            };
-            return portalGroup;
-        }
-
-        private static IDataReader CreateValidPortalGroupsReader(int count, int startUserId)
-        {
-            DataTable table = CreatePortalGroupTable();
-            for (int i = Constants.PORTALGROUP_ValidPortalGroupId; i < Constants.PORTALGROUP_ValidPortalGroupId + count; i++)
-            {
-                string name = (count == 1) ? Constants.PORTALGROUP_ValidName : GetName(i);
-                string description = (count == 1) ? Constants.PORTALGROUP_ValidDescription : GetDescription(i);
-                const string domain = "mydomain.com";
-                int userId = (startUserId == Null.NullInteger) ? Constants.USER_ValidId + i : startUserId;
-
-                table.Rows.Add(new object[]
-                                   {
-                                       i,
-                                       -1,
-                                       name,
-                                       description,
-                                       domain,
-                                       userId,
-                                   });
-            }
-
-            return table.CreateDataReader();
-        }
-    }
-
-    // ReSharper restore InconsistentNaming
-}
+namespace DotNetNuke.Tests.Core.Controllers.Portal
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Portals.Data;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    // ReSharper disable InconsistentNaming
+    [TestFixture]
+    public class PortalGroupControllerTests
+    {
+        private Mock<DataProvider> mockData;
+#pragma warning disable 649
+        private UserCopiedCallback userCopied;
+#pragma warning restore 649
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            this.mockData = MockComponentProvider.CreateDataProvider();
+            DataTable hostSettingsTable = new DataTable("HostSettings");
+
+            var nameCol = hostSettingsTable.Columns.Add("SettingName");
+            hostSettingsTable.Columns.Add("SettingValue");
+            hostSettingsTable.Columns.Add("SettingIsSecure");
+            hostSettingsTable.PrimaryKey = new[] { nameCol };
+
+            hostSettingsTable.Rows.Add("PerformanceSetting", "0", false);
+            this.mockData.Setup(c => c.GetHostSettings()).Returns(hostSettingsTable.CreateDataReader());
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_Constructor_Throws_On_Null_DataService()
+        {
+            // Arrange
+            var mockPortalController = new Mock<IPortalController>();
+
+            // Act, Assert
+            new PortalGroupController(null, mockPortalController.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_Constructor_Throws_On_Null_PortalController()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+
+            // Act, Assert
+            new PortalGroupController(mockDataService.Object, null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_AddPortalToGroup_Throws_On_Null_PortalGroup()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
+
+            // Act, Assert
+            controller.AddPortalToGroup(portal, null, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_AddPortalToGroup_Throws_On_Null_Portal()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+            var portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
+
+            // Act, Assert
+            controller.AddPortalToGroup(null, portalGroup, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void PortalGroupController_AddPortalToGroup_Throws_On_Negative_PortalGroupId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
+
+            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = -1 };
+
+            // Act, Assert
+            controller.AddPortalToGroup(portal, portalGroup, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void PortalGroupController_AddPortalToGroup_Throws_On_Negative_PortalId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portal = new PortalInfo { PortalID = -1 };
+
+            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
+
+            // Act, Assert
+            controller.AddPortalToGroup(portal, portalGroup, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_AddPortalGroup_Throws_On_Null_PortalGroup()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act, Assert
+            controller.AddPortalGroup(null);
+        }
+
+        [Test]
+        public void PortalGroupController_AddPortalGroup_Calls_DataService_On_Valid_Arguments()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
+
+            // Act
+            controller.AddPortalGroup(portalGroup);
+
+            // Assert
+            mockDataService.Verify(ds => ds.AddPortalGroup(portalGroup, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void PortalGroupController_AddPortalGroup_Calls_PortalController_On_Valid_Arguments()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            var masterPortal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
+            var mockPortalController = new Mock<IPortalController>();
+            mockPortalController.Setup(pc => pc.GetPortal(Constants.PORTAL_ValidPortalId))
+                        .Returns(masterPortal);
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
+
+            // Act
+            controller.AddPortalGroup(portalGroup);
+
+            // Assert
+            mockPortalController.Verify(pc => pc.GetPortal(portalGroup.MasterPortalId));
+            mockPortalController.Verify(pc => pc.UpdatePortalInfo(masterPortal));
+        }
+
+        [Test]
+        public void PortalGroupController_AddPortalGroup_Returns_ValidId_On_Valid_PortalGroup()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddPortalGroup(It.IsAny<PortalGroupInfo>(), It.IsAny<int>())).Returns(Constants.PORTALGROUP_AddPortalGroupId);
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
+
+            // Act
+            int portalGroupId = controller.AddPortalGroup(portalGroup);
+
+            // Assert
+            Assert.AreEqual(Constants.PORTALGROUP_AddPortalGroupId, portalGroupId);
+        }
+
+        [Test]
+        public void PortalGroupController_AddPortalGroup_Sets_PortalGroupId_Property_On_Valid_PortalGroup()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.AddPortalGroup(It.IsAny<PortalGroupInfo>(), It.IsAny<int>())).Returns(Constants.PORTALGROUP_AddPortalGroupId);
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId;
+
+            // Act
+            controller.AddPortalGroup(portalGroup);
+
+            // Assert
+            Assert.AreEqual(Constants.PORTALGROUP_AddPortalGroupId, portalGroup.PortalGroupId);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_DeletePortalGroup_Throws_On_Null_PortalGroup()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act, Assert
+            controller.DeletePortalGroup(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void PortalGroupController_DeletePortalGroup_Throws_On_Negative_PortalGroupId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Null.NullInteger;
+
+            // Act, Assert
+            controller.DeletePortalGroup(portalGroup);
+        }
+
+        [Test]
+        public void PortalGroupController_DeletePortalGroup_Calls_DataService_On_Valid_PortalGroupId()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            PortalGroupInfo portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_DeletePortalGroupId;
+
+            // Act
+            controller.DeletePortalGroup(portalGroup);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeletePortalGroup(portalGroup));
+        }
+
+        [Test]
+
+        public void PortalGroupController_GetPortalGroups_Calls_DataService()
+        {
+            // Arrange
+            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
+
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(0, Constants.USER_ValidId));
+
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act
+            controller.GetPortalGroups();
+
+            // Assert
+            mockDataService.Verify(ds => ds.GetPortalGroups());
+        }
+
+        [Test]
+        public void PortalGroupController_GetPortalGroups_Returns_EmptyList_If_No_Items()
+        {
+            // Arrange
+            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
+
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(0, Constants.USER_ValidId));
+
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act
+            IEnumerable<PortalGroupInfo> portalGroups = controller.GetPortalGroups();
+
+            // Assert
+            Assert.AreEqual(0, portalGroups.Count());
+        }
+
+        [Test]
+        public void PortalGroupController_GetPortalGroups_Returns_List_Of_PortalGroups()
+        {
+            // Arrange
+            var mockCache = MockComponentProvider.CreateNew<CachingProvider>();
+            mockCache.Setup(c => c.GetItem(CachingProvider.GetCacheKey(DataCache.PortalGroupsCacheKey))).Returns(null);
+
+            Mock<IDataService> mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(CreateValidPortalGroupsReader(
+                Constants.PORTALGROUP_ValidPortalGroupCount,
+                Constants.USER_ValidId));
+
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act
+            IEnumerable<PortalGroupInfo> portalGroups = controller.GetPortalGroups();
+
+            // Assert
+            Assert.AreEqual(Constants.PORTALGROUP_ValidPortalGroupCount, portalGroups.Count());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Null_PortalGroup()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
+
+            // Act, Assert
+            controller.RemovePortalFromGroup(portal, null, false, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Null_Portal()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+            var portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
+
+            // Act, Assert
+            controller.RemovePortalFromGroup(null, portalGroup, false, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Negative_PortalGroupId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portal = new PortalInfo { PortalID = Constants.PORTAL_ValidPortalId };
+
+            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = -1 };
+
+            // Act, Assert
+            controller.RemovePortalFromGroup(portal, portalGroup, false, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void PortalGroupController_RemovePortalFromGroup_Throws_On_Negative_PortalId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portal = new PortalInfo { PortalID = -1 };
+
+            PortalGroupInfo portalGroup = new PortalGroupInfo { PortalGroupId = Constants.PORTALGROUP_ValidPortalGroupId };
+
+            // Act, Assert
+            controller.RemovePortalFromGroup(portal, portalGroup, false, this.userCopied);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void PortalGroupController_UpdatePortalGroup_Throws_On_Null_PortalGroup()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            // Act, Assert
+            controller.UpdatePortalGroup(null);
+        }
+
+        [Test]
+        public void PortalGroupController_UpdatePortalGroup_Throws_On_Negative_PortalGroupId()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portalGroup = new PortalGroupInfo();
+            portalGroup.PortalGroupId = Null.NullInteger;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() => controller.UpdatePortalGroup(portalGroup));
+        }
+
+        [Test]
+        public void PortalGroupController_UpdatePortalGroup_Calls_DataService_On_Valid_PortalGroup()
+        {
+            // Arrange
+            MockComponentProvider.CreateNew<CachingProvider>();
+            var mockDataService = new Mock<IDataService>();
+            var mockPortalController = new Mock<IPortalController>();
+            var controller = new PortalGroupController(mockDataService.Object, mockPortalController.Object);
+
+            var portalGroup = CreateValidPortalGroup();
+            portalGroup.PortalGroupId = Constants.PORTALGROUP_UpdatePortalGroupId;
+            portalGroup.PortalGroupName = Constants.PORTALGROUP_UpdateName;
+            portalGroup.PortalGroupDescription = Constants.PORTALGROUP_UpdateDescription;
+
+            // Act
+            controller.UpdatePortalGroup(portalGroup);
+
+            // Assert
+            mockDataService.Verify(ds => ds.UpdatePortalGroup(portalGroup, It.IsAny<int>()));
+        }
+
+        private static DataTable CreatePortalGroupTable()
+        {
+            // Create Categories table.
+            DataTable table = new DataTable();
+
+            // Create columns, ID and Name.
+            DataColumn idColumn = table.Columns.Add("PortalGroupID", typeof(int));
+            table.Columns.Add("MasterPortalID", typeof(int));
+            table.Columns.Add("PortalGroupName", typeof(string));
+            table.Columns.Add("PortalGroupDescription", typeof(string));
+            table.Columns.Add("AuthenticationDomain", typeof(string));
+            table.Columns.Add("CreatedByUserID", typeof(int));
+            table.Columns.Add("CreatedOnDate", typeof(DateTime));
+            table.Columns.Add("LastModifiedByUserID", typeof(int));
+            table.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+
+            // Set the ID column as the primary key column.
+            table.PrimaryKey = new[] { idColumn };
+
+            return table;
+        }
+
+        private static string GetName(int i)
+        {
+            return string.Format(string.Format(Constants.PORTALGROUP_ValidNameFormat, i));
+        }
+
+        private static string GetDescription(int i)
+        {
+            return string.Format(string.Format(Constants.PORTALGROUP_ValidDescriptionFormat, i));
+        }
+
+        private static PortalGroupInfo CreateValidPortalGroup()
+        {
+            var portalGroup = new PortalGroupInfo
+            {
+                PortalGroupName = Constants.PORTALGROUP_ValidName,
+                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
+                MasterPortalId = Constants.PORTAL_ValidPortalId,
+            };
+            return portalGroup;
+        }
+
+        private static IDataReader CreateValidPortalGroupsReader(int count, int startUserId)
+        {
+            DataTable table = CreatePortalGroupTable();
+            for (int i = Constants.PORTALGROUP_ValidPortalGroupId; i < Constants.PORTALGROUP_ValidPortalGroupId + count; i++)
+            {
+                string name = (count == 1) ? Constants.PORTALGROUP_ValidName : GetName(i);
+                string description = (count == 1) ? Constants.PORTALGROUP_ValidDescription : GetDescription(i);
+                const string domain = "mydomain.com";
+                int userId = (startUserId == Null.NullInteger) ? Constants.USER_ValidId + i : startUserId;
+
+                table.Rows.Add(new object[]
+                                   {
+                                       i,
+                                       -1,
+                                       name,
+                                       description,
+                                       domain,
+                                       userId,
+                                   });
+            }
+
+            return table.CreateDataReader();
+        }
+    }
+
+    // ReSharper restore InconsistentNaming
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/InternalSearchControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/InternalSearchControllerTests.cs
index 709036f7cdb..2d9d7d85549 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/InternalSearchControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/InternalSearchControllerTests.cs	
@@ -2,747 +2,754 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Search
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.IO;
+namespace DotNetNuke.Tests.Core.Controllers.Search
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.IO;
     using System.Threading;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Localization;
-    using DotNetNuke.Services.Search.Entities;
-    using DotNetNuke.Services.Search.Internals;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Localization;
+    using DotNetNuke.Services.Search.Entities;
+    using DotNetNuke.Services.Search.Internals;
     using DotNetNuke.Tests.Utilities.Mocks;
+
     using Microsoft.Extensions.DependencyInjection;
-    using Moq;
-    using NUnit.Framework;
-
-    /// <summary>
-    ///  Testing various aspects of SearchController.
-    /// </summary>
-    [TestFixture]
-    public class InternalSearchControllerTests
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///  Testing various aspects of SearchController.
+    /// </summary>
+    [TestFixture]
+    public class InternalSearchControllerTests
     {
-        private const int ModuleSearchTypeId = (int)SearchTypeIds.ModuleSearchTypeId;
-        private const int TabSearchTypeId = (int)SearchTypeIds.TabSearchTypeId;
-        private const int DocumentSearchTypeId = (int)SearchTypeIds.DocumentSearchTypeId;
-
-        private const int UrlSearchTypeId = (int)SearchTypeIds.UrlSearchTypeId;
-        private const int OtherSearchTypeId = (int)SearchTypeIds.OtherSearchTypeId;
-        private const int UnknownSearchTypeId = (int)SearchTypeIds.UnknownSearchTypeId;
-
-        private const int PortalId0 = 0;
-        private const int PortalId1 = 1;
-
-        private const string TermDNN = "DNN";
-        private const string TermDotNetNuke = "DotnetNuke";
-        private const string TermLaptop = "Laptop";
-        private const string TermNotebook = "Notebook";
-        private const string TermJump = "Jump";
-        private const string TermLeap = "Leap";
-        private const string TermHop = "Hop";
-
-        private const string ModuleSearchTypeName = "module";
-        private const string OtherSearchTypeName = "other";
-        private const string TabSearchTypeName = "tab";
-        private const string DocumentSearchTypeName = "document";
-        private const string UrlSearchTypeName = "url";
-        private const string ModuleResultControllerClass = "DotNetNuke.Services.Search.Crawlers.ModuleResultController, DotNetNuke";
-        private const string FakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.FakeResultController, DotNetNuke.Tests.Core";
-
-        private const string NoPermissionFakeResultControllerClass =
-            "DotNetNuke.Tests.Core.Controllers.Search.NoPermissionFakeResultController, DotNetNuke.Tests.Core";
-
-        private const string CultureEnUs = "en-US";
-        private const string CultureEnCa = "en-CA";
-        private const string CultureItIt = "it-IT";
-        private const string CultureEsEs = "es-ES";
-        private const int LanguageIdEnUs = 1;
-        private const int LanguageIdEnFr = 2;
-        private const int LanguageIdItIt = 3;
-        private const int LanguageIdEsEs = 4;
-
-        private const string SearchIndexFolder = @"App_Data\InternalSearchTests";
-        private readonly double _readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
-        private Mock<IHostController> _mockHostController;
-        private Mock<CachingProvider> _mockCachingProvider;
-        private Mock<DataProvider> _mockDataProvider;
-        private Mock<ILocaleController> _mockLocaleController;
-        private Mock<ISearchHelper> _mockSearchHelper;
-        private Mock<IUserController> _mockUserController;
-
-        private IInternalSearchController _internalSearchController;
-        private LuceneControllerImpl _luceneController;
-
-        public enum SearchTypeIds
-        {
-            ModuleSearchTypeId = 1,
-            TabSearchTypeId,
-            DocumentSearchTypeId,
-            UrlSearchTypeId,
-            OtherSearchTypeId,
-            UnknownSearchTypeId,
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            ComponentFactory.Container = new SimpleContainer();
-            MockComponentProvider.ResetContainer();
-
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            this._mockDataProvider = MockComponentProvider.CreateDataProvider();
-            this._mockLocaleController = MockComponentProvider.CreateLocaleController();
-            this._mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
-
-            this._mockUserController = new Mock<IUserController>();
-            this._mockHostController = new Mock<IHostController>();
-            this._mockSearchHelper = new Mock<ISearchHelper>();
-
-            this.SetupDataProvider();
-            this.SetupHostController();
-            this.SetupSearchHelper();
-            this.SetupLocaleController();
-
-            this._mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>()))
-                .Returns((int portalId, int userId) => this.GetUserByIdCallback(portalId, userId));
-            UserController.SetTestableInstance(this._mockUserController.Object);
-
-            this.CreateNewLuceneControllerInstance();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            this._luceneController.Dispose();
-            this.DeleteIndexFolder();
-            InternalSearchController.ClearInstance();
-            UserController.ClearInstance();
-            SearchHelper.ClearInstance();
-            LuceneController.ClearInstance();
-            this._luceneController = null;
-            Globals.DependencyProvider = null;
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_Null_SearchDocument()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this._internalSearchController.AddSearchDocument(null));
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_Null_Or_Empty_UniqueuKey()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentException>(() => this._internalSearchController.AddSearchDocument(new SearchDocument()));
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_Null_OrEmpty_Title()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentOutOfRangeException>(
-                () => this._internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString() }));
-        }
-
-        [Test]
-        public void SearchController_AddSearchDcoumets_Does_Not_Throw_On_Null_OrEmpty_Title()
-        {
-            // Arrange
-            var documents = new List<SearchDocument> { new SearchDocument { UniqueKey = Guid.NewGuid().ToString() } };
-
-            // Act, Assert
-            this._internalSearchController.AddSearchDocuments(documents);
-        }
-
-        [Test]
-        public void SearchController_AddSearchDcoumets_Does_Not_Throw_On_Empty_Search_Document()
-        {
-            // Arrange
-            var documents = new List<SearchDocument> { new SearchDocument() };
-
-            // Act, Assert
-            this._internalSearchController.AddSearchDocuments(documents);
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_Zero_SearchTypeId()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentOutOfRangeException>(
-                () => this._internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString() }));
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_Negative_SearchTypeId()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentOutOfRangeException>(
-                () =>
-                    this._internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "title", SearchTypeId = -1 }));
-        }
-
-        [Test]
-        public void SearchController_Add_Throws_On_DateTimeMin_ModifiedTimeUtc()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentException>(
-                () => this._internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "title", SearchTypeId = 1 }));
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_ModuleDefinition_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10;
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    ModuleDefId = i,
-                    ModuleId = 100,
-                    SearchTypeId = ModuleSearchTypeId,
-                    PortalId = PortalId0,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    ModifiedTimeUtc = now,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete last item
-            var searchDoc = new SearchDocument { ModuleDefId = totalDocs };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
-            Assert.AreEqual(1, stats.TotalDeletedDocuments);
-
-            // Act - delete first item
-            searchDoc = new SearchDocument { ModuleDefId = 1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(2, stats.TotalDeletedDocuments);
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_Module_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10;
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    ModuleId = i,
-                    ModuleDefId = 10,
-                    PortalId = PortalId0,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = ModuleSearchTypeId,
-                    ModifiedTimeUtc = now,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete last item
-            var searchDoc = new SearchDocument { ModuleId = totalDocs };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
-            Assert.AreEqual(1, stats.TotalDeletedDocuments);
-
-            // Act - delete first item
-            searchDoc = new SearchDocument { ModuleId = 1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(2, stats.TotalDeletedDocuments);
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_Portals_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10; // must be even
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    PortalId = i <= (totalDocs / 2) ? PortalId0 : PortalId1,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = ModuleSearchTypeId,
-                    ModifiedTimeUtc = now,
-                    ModuleId = 100,
-                    ModuleDefId = 10,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete all portal 1 items
-            var searchDoc = new SearchDocument { PortalId = PortalId1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert - delete all portal 1
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs / 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(totalDocs / 2, stats.TotalDeletedDocuments);
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_Roles_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10;
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    RoleId = i,
-                    PortalId = PortalId0,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = ModuleSearchTypeId,
-                    ModifiedTimeUtc = now,
-                    ModuleId = 100,
-                    ModuleDefId = 10,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete last item
-            var searchDoc = new SearchDocument { RoleId = totalDocs };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
-            Assert.AreEqual(1, stats.TotalDeletedDocuments);
-
-            // Act - delete first item
-            searchDoc = new SearchDocument { RoleId = 1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(2, stats.TotalDeletedDocuments);
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_Tabs_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10;
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    TabId = i,
-                    PortalId = PortalId0,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = TabSearchTypeId,
-                    ModifiedTimeUtc = now,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete last item
-            var searchDoc = new SearchDocument { TabId = totalDocs };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
-            Assert.AreEqual(1, stats.TotalDeletedDocuments);
-
-            // Act - delete first item
-            searchDoc = new SearchDocument { TabId = 1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(2, stats.TotalDeletedDocuments);
-        }
-
-        [Test]
-        public void SearchController_Add_Then_Delete_Users_WorksAsExpected()
-        {
-            // Arrange
-            const int totalDocs = 10;
-            var now = DateTime.UtcNow;
-
-            // Act
-            for (var i = 1; i <= totalDocs; i++)
-            {
-                var doc = new SearchDocument
-                {
-                    AuthorUserId = i,
-                    PortalId = PortalId0,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = ModuleSearchTypeId,
-                    ModifiedTimeUtc = now,
-                    ModuleId = 100,
-                    ModuleDefId = 10,
-                };
-
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            // Assert
-            var stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
-
-            // Act - delete last item
-            var searchDoc = new SearchDocument { AuthorUserId = totalDocs };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
-            Assert.AreEqual(1, stats.TotalDeletedDocuments);
-
-            // Act - delete first item
-            searchDoc = new SearchDocument { AuthorUserId = 1 };
-            this._internalSearchController.DeleteSearchDocument(searchDoc);
-
-            // Assert
-            stats = this.GetSearchStatistics();
-            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
-            Assert.AreEqual(2, stats.TotalDeletedDocuments);
-        }
-
-        private void CreateNewLuceneControllerInstance()
-        {
-            this.DeleteIndexFolder();
-            InternalSearchController.SetTestableInstance(new InternalSearchControllerImpl());
-            this._internalSearchController = InternalSearchController.Instance;
-
-            if (this._luceneController != null)
-            {
-                LuceneController.ClearInstance();
-                this._luceneController.Dispose();
-            }
-
-            this._luceneController = new LuceneControllerImpl();
-            LuceneController.SetTestableInstance(this._luceneController);
-        }
-
-        private void SetupHostController()
-        {
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
-            this._mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this._readerStaleTimeSpan);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTitleBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTagBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchKeywordBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>()))
-                .Returns(Constants.DefaultSearchDescriptionBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchAuthorBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
-            HostController.RegisterInstance(this._mockHostController.Object);
-        }
-
-        private void SetupLocaleController()
-        {
-            this._mockLocaleController.Setup(l => l.GetLocale(It.IsAny<string>())).Returns(new Locale { LanguageId = -1, Code = string.Empty });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEnCa)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
-
-            this._mockLocaleController.Setup(l => l.GetLocale(It.IsAny<int>())).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnFr)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
-        }
-
-        private void SetupDataProvider()
-        {
-            // Standard DataProvider Path for Logging
-            this._mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-
-            DataTableReader searchTypes = null;
-            this._mockDataProvider.Setup(ds => ds.GetAllSearchTypes())
-                .Callback(() => searchTypes = this.GetAllSearchTypes().CreateDataReader())
-                .Returns(() => searchTypes);
-
-            this._mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
-        }
-
-        private IDataReader GetPortalsCallBack(string culture)
-        {
-            return this.GetPortalCallBack(PortalId0, CultureEnUs);
-        }
-
-        private IDataReader GetPortalCallBack(int portalId, string culture)
-        {
-            var table = new DataTable("Portal");
-
-            var cols = new[]
-            {
-                "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId",
-                "Currency", "HostFee",
-                "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID",
-                "PaymentProcessor", "ProcessorUserId",
-                "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId",
-                "LoginTabId", "RegisterTabId",
-                "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID",
-                "LastModifiedOnDate", "CultureCode",
-            };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            const int homePage = 1;
-            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null,
-                "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null,
-                "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0",
-                null, homePage.ToString("D"), null, null, "57", "56", "-1", "-1", "7", null, null, "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
-
-            return table.CreateDataReader();
-        }
-
-        private void SetupSearchHelper()
-        {
-            this._mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
-            this._mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>()))
-                .Returns<int, string, string>(this.GetSynonymsCallBack);
-            this._mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>()))
-                .Returns((string name) => new SearchType { SearchTypeId = 0, SearchTypeName = name });
-            this._mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(this.GetSearchTypeByNameCallback);
-            this._mockSearchHelper.Setup(x => x.GetSearchTypes()).Returns(this.GetSearchTypes());
-            this._mockSearchHelper.Setup(c => c.GetSynonymsGroups(It.IsAny<int>(), It.IsAny<string>())).Returns(this.GetSynonymsGroupsCallBack);
-            this._mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEsEs)).Returns(
-                new SearchStopWords
-                {
-                    PortalId = 0,
-                    CultureCode = CultureEsEs,
-                    StopWords = "los,de,el",
-                });
-            this._mockSearchHelper.Setup(x => x.RephraseSearchText(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns<string, bool, bool>(new SearchHelperImpl().RephraseSearchText);
-            this._mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
-            SearchHelper.SetTestableInstance(this._mockSearchHelper.Object);
-        }
-
-        private IList<SynonymsGroup> GetSynonymsGroupsCallBack()
-        {
-            var groups = new List<SynonymsGroup>
-            {
-                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 1, SynonymsTags = string.Join(",", TermDNN, TermDotNetNuke) },
-                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 2, SynonymsTags = string.Join(",", TermLaptop, TermNotebook) },
-                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 3, SynonymsTags = string.Join(",", TermJump, TermLeap, TermHop) },
-            };
-
-            return groups;
-        }
-
-        private SearchType GetSearchTypeByNameCallback(string searchTypeName)
-        {
-            var searchType = new SearchType { SearchTypeName = searchTypeName, SearchTypeId = 0 };
-            switch (searchTypeName)
-            {
-                case ModuleSearchTypeName:
-                    searchType.SearchTypeId = ModuleSearchTypeId;
-                    break;
-                case TabSearchTypeName:
-                    searchType.SearchTypeId = TabSearchTypeId;
-                    break;
-                case OtherSearchTypeName:
-                    searchType.SearchTypeId = OtherSearchTypeId;
-                    break;
-                case DocumentSearchTypeName:
-                    searchType.SearchTypeId = DocumentSearchTypeId;
-                    break;
-                case UrlSearchTypeName:
-                    searchType.SearchTypeId = UrlSearchTypeId;
-                    break;
-            }
-
-            return searchType;
-        }
-
-        private IList<string> GetSynonymsCallBack(int portalId, string cultureCode, string term)
-        {
-            var synonyms = new List<string>();
+        private const int ModuleSearchTypeId = (int)SearchTypeIds.ModuleSearchTypeId;
+        private const int TabSearchTypeId = (int)SearchTypeIds.TabSearchTypeId;
+        private const int DocumentSearchTypeId = (int)SearchTypeIds.DocumentSearchTypeId;
+
+        private const int UrlSearchTypeId = (int)SearchTypeIds.UrlSearchTypeId;
+        private const int OtherSearchTypeId = (int)SearchTypeIds.OtherSearchTypeId;
+        private const int UnknownSearchTypeId = (int)SearchTypeIds.UnknownSearchTypeId;
+
+        private const int PortalId0 = 0;
+        private const int PortalId1 = 1;
+
+        private const string TermDNN = "DNN";
+        private const string TermDotNetNuke = "DotnetNuke";
+        private const string TermLaptop = "Laptop";
+        private const string TermNotebook = "Notebook";
+        private const string TermJump = "Jump";
+        private const string TermLeap = "Leap";
+        private const string TermHop = "Hop";
+
+        private const string ModuleSearchTypeName = "module";
+        private const string OtherSearchTypeName = "other";
+        private const string TabSearchTypeName = "tab";
+        private const string DocumentSearchTypeName = "document";
+        private const string UrlSearchTypeName = "url";
+        private const string ModuleResultControllerClass = "DotNetNuke.Services.Search.Crawlers.ModuleResultController, DotNetNuke";
+        private const string FakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.FakeResultController, DotNetNuke.Tests.Core";
+
+        private const string NoPermissionFakeResultControllerClass =
+            "DotNetNuke.Tests.Core.Controllers.Search.NoPermissionFakeResultController, DotNetNuke.Tests.Core";
+
+        private const string CultureEnUs = "en-US";
+        private const string CultureEnCa = "en-CA";
+        private const string CultureItIt = "it-IT";
+        private const string CultureEsEs = "es-ES";
+        private const int LanguageIdEnUs = 1;
+        private const int LanguageIdEnFr = 2;
+        private const int LanguageIdItIt = 3;
+        private const int LanguageIdEsEs = 4;
+
+        private const string SearchIndexFolder = @"App_Data\InternalSearchTests";
+        private readonly double readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
+        private Mock<IHostController> mockHostController;
+        private Mock<CachingProvider> mockCachingProvider;
+        private Mock<DataProvider> mockDataProvider;
+        private Mock<ILocaleController> mockLocaleController;
+        private Mock<ISearchHelper> mockSearchHelper;
+        private Mock<IUserController> mockUserController;
+
+        private IInternalSearchController internalSearchController;
+        private LuceneControllerImpl luceneController;
+
+        public enum SearchTypeIds
+        {
+            ModuleSearchTypeId = 1,
+            TabSearchTypeId,
+            DocumentSearchTypeId,
+            UrlSearchTypeId,
+            OtherSearchTypeId,
+            UnknownSearchTypeId,
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            ComponentFactory.Container = new SimpleContainer();
+            MockComponentProvider.ResetContainer();
+
+            this.mockHostController = new Mock<IHostController>();
+            this.SetupHostController();
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            this.mockDataProvider = MockComponentProvider.CreateDataProvider();
+            this.mockLocaleController = MockComponentProvider.CreateLocaleController();
+            this.mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
+            this.mockUserController = new Mock<IUserController>();
+
+            this.mockSearchHelper = new Mock<ISearchHelper>();
+            this.SetupDataProvider();
+            this.SetupSearchHelper();
+            this.SetupLocaleController();
+
+            this.mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>()))
+                .Returns((int portalId, int userId) => this.GetUserByIdCallback(portalId, userId));
+            UserController.SetTestableInstance(this.mockUserController.Object);
+
+            this.CreateNewLuceneControllerInstance();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            this.mockHostController = null;
+            Globals.DependencyProvider = null;
+            this.luceneController.Dispose();
+            this.DeleteIndexFolder();
+            InternalSearchController.ClearInstance();
+            UserController.ClearInstance();
+            SearchHelper.ClearInstance();
+            LuceneController.ClearInstance();
+            this.luceneController = null;
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_Null_SearchDocument()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => this.internalSearchController.AddSearchDocument(null));
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_Null_Or_Empty_UniqueuKey()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentException>(() => this.internalSearchController.AddSearchDocument(new SearchDocument()));
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_Null_OrEmpty_Title()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () => this.internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString() }));
+        }
+
+        [Test]
+        public void SearchController_AddSearchDcoumets_Does_Not_Throw_On_Null_OrEmpty_Title()
+        {
+            // Arrange
+            var documents = new List<SearchDocument> { new SearchDocument { UniqueKey = Guid.NewGuid().ToString() } };
+
+            // Act, Assert
+            this.internalSearchController.AddSearchDocuments(documents);
+        }
+
+        [Test]
+        public void SearchController_AddSearchDcoumets_Does_Not_Throw_On_Empty_Search_Document()
+        {
+            // Arrange
+            var documents = new List<SearchDocument> { new SearchDocument() };
+
+            // Act, Assert
+            this.internalSearchController.AddSearchDocuments(documents);
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_Zero_SearchTypeId()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () => this.internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString() }));
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_Negative_SearchTypeId()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () =>
+                    this.internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "title", SearchTypeId = -1 }));
+        }
+
+        [Test]
+        public void SearchController_Add_Throws_On_DateTimeMin_ModifiedTimeUtc()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentException>(
+                () => this.internalSearchController.AddSearchDocument(new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "title", SearchTypeId = 1 }));
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_ModuleDefinition_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10;
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    ModuleDefId = i,
+                    ModuleId = 100,
+                    SearchTypeId = ModuleSearchTypeId,
+                    PortalId = PortalId0,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    ModifiedTimeUtc = now,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete last item
+            var searchDoc = new SearchDocument { ModuleDefId = totalDocs };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
+            Assert.AreEqual(1, stats.TotalDeletedDocuments);
+
+            // Act - delete first item
+            searchDoc = new SearchDocument { ModuleDefId = 1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(2, stats.TotalDeletedDocuments);
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_Module_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10;
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    ModuleId = i,
+                    ModuleDefId = 10,
+                    PortalId = PortalId0,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = ModuleSearchTypeId,
+                    ModifiedTimeUtc = now,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete last item
+            var searchDoc = new SearchDocument { ModuleId = totalDocs };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
+            Assert.AreEqual(1, stats.TotalDeletedDocuments);
+
+            // Act - delete first item
+            searchDoc = new SearchDocument { ModuleId = 1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(2, stats.TotalDeletedDocuments);
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_Portals_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10; // must be even
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    PortalId = i <= (totalDocs / 2) ? PortalId0 : PortalId1,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = ModuleSearchTypeId,
+                    ModifiedTimeUtc = now,
+                    ModuleId = 100,
+                    ModuleDefId = 10,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete all portal 1 items
+            var searchDoc = new SearchDocument { PortalId = PortalId1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert - delete all portal 1
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs / 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(totalDocs / 2, stats.TotalDeletedDocuments);
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_Roles_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10;
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    RoleId = i,
+                    PortalId = PortalId0,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = ModuleSearchTypeId,
+                    ModifiedTimeUtc = now,
+                    ModuleId = 100,
+                    ModuleDefId = 10,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete last item
+            var searchDoc = new SearchDocument { RoleId = totalDocs };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
+            Assert.AreEqual(1, stats.TotalDeletedDocuments);
+
+            // Act - delete first item
+            searchDoc = new SearchDocument { RoleId = 1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(2, stats.TotalDeletedDocuments);
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_Tabs_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10;
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    TabId = i,
+                    PortalId = PortalId0,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = TabSearchTypeId,
+                    ModifiedTimeUtc = now,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete last item
+            var searchDoc = new SearchDocument { TabId = totalDocs };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
+            Assert.AreEqual(1, stats.TotalDeletedDocuments);
+
+            // Act - delete first item
+            searchDoc = new SearchDocument { TabId = 1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(2, stats.TotalDeletedDocuments);
+        }
+
+        [Test]
+        public void SearchController_Add_Then_Delete_Users_WorksAsExpected()
+        {
+            // Arrange
+            const int totalDocs = 10;
+            var now = DateTime.UtcNow;
+
+            // Act
+            for (var i = 1; i <= totalDocs; i++)
+            {
+                var doc = new SearchDocument
+                {
+                    AuthorUserId = i,
+                    PortalId = PortalId0,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = ModuleSearchTypeId,
+                    ModifiedTimeUtc = now,
+                    ModuleId = 100,
+                    ModuleDefId = 10,
+                };
+
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            // Assert
+            var stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs, stats.TotalActiveDocuments);
+
+            // Act - delete last item
+            var searchDoc = new SearchDocument { AuthorUserId = totalDocs };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 1, stats.TotalActiveDocuments);
+            Assert.AreEqual(1, stats.TotalDeletedDocuments);
+
+            // Act - delete first item
+            searchDoc = new SearchDocument { AuthorUserId = 1 };
+            this.internalSearchController.DeleteSearchDocument(searchDoc);
+
+            // Assert
+            stats = this.GetSearchStatistics();
+            Assert.AreEqual(totalDocs - 2, stats.TotalActiveDocuments);
+            Assert.AreEqual(2, stats.TotalDeletedDocuments);
+        }
+
+        private void CreateNewLuceneControllerInstance()
+        {
+            this.DeleteIndexFolder();
+            InternalSearchController.SetTestableInstance(new InternalSearchControllerImpl());
+            this.internalSearchController = InternalSearchController.Instance;
+
+            if (this.luceneController != null)
+            {
+                LuceneController.ClearInstance();
+                this.luceneController.Dispose();
+            }
+
+            this.luceneController = new LuceneControllerImpl();
+            LuceneController.SetTestableInstance(this.luceneController);
+        }
+
+        private void SetupHostController()
+        {
+            this.mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
+            this.mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this.readerStaleTimeSpan);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTitleBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTagBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchKeywordBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>()))
+                .Returns(Constants.DefaultSearchDescriptionBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchAuthorBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
+            this.mockHostController.As<IHostSettingsService>();
+        }
+
+        private void SetupLocaleController()
+        {
+            this.mockLocaleController.Setup(l => l.GetLocale(It.IsAny<string>())).Returns(new Locale { LanguageId = -1, Code = string.Empty });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEnCa)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
+
+            this.mockLocaleController.Setup(l => l.GetLocale(It.IsAny<int>())).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnFr)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
+        }
+
+        private void SetupDataProvider()
+        {
+            // Standard DataProvider Path for Logging
+            this.mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+
+            DataTableReader searchTypes = null;
+            this.mockDataProvider.Setup(ds => ds.GetAllSearchTypes())
+                .Callback(() => searchTypes = this.GetAllSearchTypes().CreateDataReader())
+                .Returns(() => searchTypes);
+
+            this.mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
+        }
+
+        private IDataReader GetPortalsCallBack(string culture)
+        {
+            return this.GetPortalCallBack(PortalId0, CultureEnUs);
+        }
+
+        private IDataReader GetPortalCallBack(int portalId, string culture)
+        {
+            var table = new DataTable("Portal");
+
+            var cols = new[]
+            {
+                "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId",
+                "Currency", "HostFee",
+                "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID",
+                "PaymentProcessor", "ProcessorUserId",
+                "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId",
+                "LoginTabId", "RegisterTabId",
+                "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID",
+                "LastModifiedOnDate", "CultureCode",
+            };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            const int homePage = 1;
+            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null,
+                "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null,
+                "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0",
+                null, homePage.ToString("D"), null, null, "57", "56", "-1", "-1", "7", null, null, "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
+
+            return table.CreateDataReader();
+        }
+
+        private void SetupSearchHelper()
+        {
+            this.mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
+            this.mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns<int, string, string>(this.GetSynonymsCallBack);
+            this.mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>()))
+                .Returns((string name) => new SearchType { SearchTypeId = 0, SearchTypeName = name });
+            this.mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(this.GetSearchTypeByNameCallback);
+            this.mockSearchHelper.Setup(x => x.GetSearchTypes()).Returns(this.GetSearchTypes());
+            this.mockSearchHelper.Setup(c => c.GetSynonymsGroups(It.IsAny<int>(), It.IsAny<string>())).Returns(this.GetSynonymsGroupsCallBack);
+            this.mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEsEs)).Returns(
+                new SearchStopWords
+                {
+                    PortalId = 0,
+                    CultureCode = CultureEsEs,
+                    StopWords = "los,de,el",
+                });
+            this.mockSearchHelper.Setup(x => x.RephraseSearchText(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Returns<string, bool, bool>(new SearchHelperImpl().RephraseSearchText);
+            this.mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
+            SearchHelper.SetTestableInstance(this.mockSearchHelper.Object);
+        }
+
+        private IList<SynonymsGroup> GetSynonymsGroupsCallBack()
+        {
+            var groups = new List<SynonymsGroup>
+            {
+                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 1, SynonymsTags = string.Join(",", TermDNN, TermDotNetNuke) },
+                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 2, SynonymsTags = string.Join(",", TermLaptop, TermNotebook) },
+                new SynonymsGroup { PortalId = 0, SynonymsGroupId = 3, SynonymsTags = string.Join(",", TermJump, TermLeap, TermHop) },
+            };
+
+            return groups;
+        }
+
+        private SearchType GetSearchTypeByNameCallback(string searchTypeName)
+        {
+            var searchType = new SearchType { SearchTypeName = searchTypeName, SearchTypeId = 0 };
+            switch (searchTypeName)
+            {
+                case ModuleSearchTypeName:
+                    searchType.SearchTypeId = ModuleSearchTypeId;
+                    break;
+                case TabSearchTypeName:
+                    searchType.SearchTypeId = TabSearchTypeId;
+                    break;
+                case OtherSearchTypeName:
+                    searchType.SearchTypeId = OtherSearchTypeId;
+                    break;
+                case DocumentSearchTypeName:
+                    searchType.SearchTypeId = DocumentSearchTypeId;
+                    break;
+                case UrlSearchTypeName:
+                    searchType.SearchTypeId = UrlSearchTypeId;
+                    break;
+            }
+
+            return searchType;
+        }
+
+        private IList<string> GetSynonymsCallBack(int portalId, string cultureCode, string term)
+        {
+            var synonyms = new List<string>();
             if (term == "fox")
             {
                 synonyms.Add("wolf");
             }
 
-            return synonyms;
-        }
-
-        private UserInfo GetUserByIdCallback(int portalId, int userId)
-        {
-            return new UserInfo { UserID = userId, DisplayName = "User" + userId, PortalID = portalId };
-        }
-
-        private DataTable GetAllSearchTypes()
-        {
-            var dtSearchTypes = new DataTable("SearchTypes");
-            var pkId = dtSearchTypes.Columns.Add("SearchTypeId", typeof(int));
-            dtSearchTypes.Columns.Add("SearchTypeName", typeof(string));
-            dtSearchTypes.Columns.Add("SearchResultClass", typeof(string));
-            dtSearchTypes.PrimaryKey = new[] { pkId };
-
-            // Create default Crawler
-            dtSearchTypes.Rows.Add(ModuleSearchTypeId, ModuleSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(TabSearchTypeId, TabSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(OtherSearchTypeId, OtherSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(DocumentSearchTypeId, DocumentSearchTypeName, NoPermissionFakeResultControllerClass);
-            dtSearchTypes.Rows.Add(UrlSearchTypeId, UrlSearchTypeName, FakeResultControllerClass);
-
-            return dtSearchTypes;
-        }
-
-        private IEnumerable<SearchType> GetSearchTypes()
-        {
-            var searchTypes = new List<SearchType>
-            {
-                new SearchType { SearchTypeId = ModuleSearchTypeId, SearchTypeName = ModuleSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                new SearchType { SearchTypeId = TabSearchTypeId, SearchTypeName = TabSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                new SearchType { SearchTypeId = OtherSearchTypeId, SearchTypeName = OtherSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                new SearchType
-                {
-                    SearchTypeId = DocumentSearchTypeId,
-                    SearchTypeName = DocumentSearchTypeName,
-                    SearchResultClass = NoPermissionFakeResultControllerClass,
-                },
-                new SearchType { SearchTypeId = UrlSearchTypeId, SearchTypeName = UrlSearchTypeName, SearchResultClass = FakeResultControllerClass },
-            };
-
-            return searchTypes;
-        }
-
-        private void DeleteIndexFolder()
-        {
-            try
-            {
-                if (Directory.Exists(SearchIndexFolder))
-                {
-                    Directory.Delete(SearchIndexFolder, true);
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex);
-            }
-        }
-
-        private SearchStatistics GetSearchStatistics()
-        {
-            this._internalSearchController.Commit();
-            Thread.Sleep((int)(this._readerStaleTimeSpan * 1000)); // time to flush data to Lucene
-            return this._internalSearchController.GetSearchStatistics();
-        }
-
-#if false // the rules have changed and these are invalid tests now
-        [Test]
-        public void SearchController_Delete_Throws_On_Null_Or_Empty_UniqueuKey()
-        {
-            //Arrange            
-
-            //Act, Assert
-            var searchDoc = new SearchDocument() { UniqueKey = null, PortalId = 0, SearchTypeId = 1 };
-            Assert.Throws<ArgumentException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
-        }
-
-        [Test]
-        public void SearchController_Delete_Throws_On_Zero_SearchTypeId()
-        {
-            //Arrange            
-
-            //Act, Assert
-            var searchDoc = new SearchDocument() { UniqueKey = "key", PortalId = 0, SearchTypeId = 0 };
-            Assert.Throws<ArgumentException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
-        }
-
-        [Test]
-        public void SearchController_Delete_Throws_On_Negative_SearchTypeId()
-        {
-            //Arrange            
-
-            //Act, Assert
-            var searchDoc = new SearchDocument() { UniqueKey = "key", PortalId = 0, SearchTypeId = -1 };
-            Assert.Throws<ArgumentOutOfRangeException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
-        }
-#endif
-
-    }
-}
+            return synonyms;
+        }
+
+        private UserInfo GetUserByIdCallback(int portalId, int userId)
+        {
+            return new UserInfo { UserID = userId, DisplayName = "User" + userId, PortalID = portalId };
+        }
+
+        private DataTable GetAllSearchTypes()
+        {
+            var dtSearchTypes = new DataTable("SearchTypes");
+            var pkId = dtSearchTypes.Columns.Add("SearchTypeId", typeof(int));
+            dtSearchTypes.Columns.Add("SearchTypeName", typeof(string));
+            dtSearchTypes.Columns.Add("SearchResultClass", typeof(string));
+            dtSearchTypes.PrimaryKey = new[] { pkId };
+
+            // Create default Crawler
+            dtSearchTypes.Rows.Add(ModuleSearchTypeId, ModuleSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(TabSearchTypeId, TabSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(OtherSearchTypeId, OtherSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(DocumentSearchTypeId, DocumentSearchTypeName, NoPermissionFakeResultControllerClass);
+            dtSearchTypes.Rows.Add(UrlSearchTypeId, UrlSearchTypeName, FakeResultControllerClass);
+
+            return dtSearchTypes;
+        }
+
+        private IEnumerable<SearchType> GetSearchTypes()
+        {
+            var searchTypes = new List<SearchType>
+            {
+                new SearchType { SearchTypeId = ModuleSearchTypeId, SearchTypeName = ModuleSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                new SearchType { SearchTypeId = TabSearchTypeId, SearchTypeName = TabSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                new SearchType { SearchTypeId = OtherSearchTypeId, SearchTypeName = OtherSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                new SearchType
+                {
+                    SearchTypeId = DocumentSearchTypeId,
+                    SearchTypeName = DocumentSearchTypeName,
+                    SearchResultClass = NoPermissionFakeResultControllerClass,
+                },
+                new SearchType { SearchTypeId = UrlSearchTypeId, SearchTypeName = UrlSearchTypeName, SearchResultClass = FakeResultControllerClass },
+            };
+
+            return searchTypes;
+        }
+
+        private void DeleteIndexFolder()
+        {
+            try
+            {
+                if (Directory.Exists(SearchIndexFolder))
+                {
+                    Directory.Delete(SearchIndexFolder, true);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+            }
+        }
+
+        private SearchStatistics GetSearchStatistics()
+        {
+            this.internalSearchController.Commit();
+            Thread.Sleep((int)(this.readerStaleTimeSpan * 1000)); // time to flush data to Lucene
+            return this.internalSearchController.GetSearchStatistics();
+        }
+
+#if false // the rules have changed and these are invalid tests now
+        [Test]
+        public void SearchController_Delete_Throws_On_Null_Or_Empty_UniqueuKey()
+        {
+            //Arrange            
+
+            //Act, Assert
+            var searchDoc = new SearchDocument() { UniqueKey = null, PortalId = 0, SearchTypeId = 1 };
+            Assert.Throws<ArgumentException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
+        }
+
+        [Test]
+        public void SearchController_Delete_Throws_On_Zero_SearchTypeId()
+        {
+            //Arrange            
+
+            //Act, Assert
+            var searchDoc = new SearchDocument() { UniqueKey = "key", PortalId = 0, SearchTypeId = 0 };
+            Assert.Throws<ArgumentException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
+        }
+
+        [Test]
+        public void SearchController_Delete_Throws_On_Negative_SearchTypeId()
+        {
+            //Arrange            
+
+            //Act, Assert
+            var searchDoc = new SearchDocument() { UniqueKey = "key", PortalId = 0, SearchTypeId = -1 };
+            Assert.Throws<ArgumentOutOfRangeException>(() => _internalSearchController.DeleteSearchDocument(searchDoc));
+        }
+#endif
+
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/LuceneControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/LuceneControllerTests.cs
index 58311a9a1c2..2a0c20442da 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/LuceneControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/LuceneControllerTests.cs	
@@ -9,6 +9,7 @@ namespace DotNetNuke.Tests.Core.Controllers.Search
     using System.IO;
     using System.Linq;
     using System.Threading;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
@@ -19,14 +20,17 @@ namespace DotNetNuke.Tests.Core.Controllers.Search
     using DotNetNuke.Services.Search.Entities;
     using DotNetNuke.Services.Search.Internals;
     using DotNetNuke.Tests.Utilities.Mocks;
+
     using Lucene.Net.Documents;
     using Lucene.Net.Index;
     using Lucene.Net.QueryParsers;
     using Lucene.Net.Search;
+
     using Microsoft.Extensions.DependencyInjection;
+
     using Moq;
-    using NUnit.Framework;
 
+    using NUnit.Framework;
     using Directory = System.IO.Directory;
 
     /// <summary>
@@ -54,41 +58,36 @@ public class LuceneControllerTests
         // Arrange
         private const int TotalTestDocs2Create = 5;
         private const string ContentFieldName = "content";
-        private readonly double _readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
+        private readonly double readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
 
-        private Mock<IHostController> _mockHostController;
-        private LuceneControllerImpl _luceneController;
-        private Mock<CachingProvider> _cachingProvider;
-        private Mock<ISearchHelper> _mockSearchHelper;
-        private Mock<SearchQuery> _mockSearchQuery;
+        private Mock<IHostController> mockHostController;
+        private LuceneControllerImpl luceneController;
+        private Mock<CachingProvider> cachingProvider;
+        private Mock<ISearchHelper> mockSearchHelper;
+        private Mock<SearchQuery> mockSearchQuery;
 
         [SetUp]
         public void SetUp()
         {
             ComponentFactory.Container = new SimpleContainer();
-            this._cachingProvider = MockComponentProvider.CreateDataCacheProvider();
+            this.cachingProvider = MockComponentProvider.CreateDataCacheProvider();
+
+            this.MockHostController();
+
+            this.mockSearchHelper = new Mock<ISearchHelper>();
+            this.mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>())).Returns<int, string, string>(this.GetSynonymsCallBack);
+            this.mockSearchHelper.Setup(c => c.GetSearchStopWords(It.IsAny<int>(), It.IsAny<string>())).Returns(new SearchStopWords());
+            this.mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
+            this.mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
+            SearchHelper.SetTestableInstance(this.mockSearchHelper.Object);
 
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
             Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
 
-            this._mockHostController = new Mock<IHostController>();
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
-            this._mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this._readerStaleTimeSpan);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(DefaultSearchRetryTimes);
-            HostController.RegisterInstance(this._mockHostController.Object);
-
-            this._mockSearchHelper = new Mock<ISearchHelper>();
-            this._mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>())).Returns<int, string, string>(this.GetSynonymsCallBack);
-            this._mockSearchHelper.Setup(c => c.GetSearchStopWords(It.IsAny<int>(), It.IsAny<string>())).Returns(new SearchStopWords());
-            this._mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
-            this._mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
-            SearchHelper.SetTestableInstance(this._mockSearchHelper.Object);
-
-            this._mockSearchQuery = new Mock<SearchQuery>();
+            this.mockSearchQuery = new Mock<SearchQuery>();
 
             this.DeleteIndexFolder();
             this.CreateNewLuceneControllerInstance();
@@ -97,17 +96,36 @@ public void SetUp()
         [TearDown]
         public void TearDown()
         {
-            this._luceneController.Dispose();
+            LuceneController.ClearInstance();
+            this.luceneController.Dispose();
             this.DeleteIndexFolder();
             SearchHelper.ClearInstance();
             Globals.DependencyProvider = null;
+
+            this.mockHostController = null;
+            this.luceneController = null;
+            this.cachingProvider = null;
+            this.mockSearchHelper = null;
+            this.mockSearchQuery = null;
+        }
+
+        private void MockHostController()
+        {
+            this.mockHostController = new Mock<IHostController>();
+
+            this.mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
+            this.mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this.readerStaleTimeSpan);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(DefaultSearchRetryTimes);
+            this.mockHostController.As<IHostSettingsService>();
         }
 
         [Test]
         public void LuceneController_SearchFolderIsAsExpected()
         {
             var inf1 = new DirectoryInfo(SearchIndexFolder);
-            var inf2 = new DirectoryInfo(this._luceneController.IndexFolder);
+            var inf2 = new DirectoryInfo(this.luceneController.IndexFolder);
             Assert.AreEqual(inf1.FullName, inf2.FullName);
         }
 
@@ -117,7 +135,7 @@ public void LuceneController_Add_Throws_On_Null_Document()
             // Arrange
 
             // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this._luceneController.Add(null));
+            Assert.Throws<ArgumentNullException>(() => this.luceneController.Add(null));
         }
 
         public void LuceneController_Add_Throws_On_Null_Query()
@@ -125,7 +143,7 @@ public void LuceneController_Add_Throws_On_Null_Query()
             // Arrange
 
             // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this._luceneController.Delete(null));
+            Assert.Throws<ArgumentNullException>(() => this.luceneController.Delete(null));
         }
 
         [Test]
@@ -134,8 +152,8 @@ public void LuceneController_Add_Empty_FiledsCollection_DoesNot_Create_Index()
             // Arrange
 
             // Act
-            this._luceneController.Add(new Document());
-            this._luceneController.Commit();
+            this.luceneController.Add(new Document());
+            this.luceneController.Commit();
 
             var numFiles = 0;
             this.DeleteIndexFolder();
@@ -155,10 +173,10 @@ public void LuceneController_GetsHighlightedDesc()
             var doc = new Document();
             doc.Add(field);
 
-            this._luceneController.Add(doc);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc);
+            this.luceneController.Commit();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
 
             // Assert
             Assert.AreEqual(1, hits.Results.Count());
@@ -180,10 +198,10 @@ public void LuceneController_HighlightedDescHtmlEncodesOutput()
             var doc = new Document();
             doc.Add(field);
 
-            this._luceneController.Add(doc);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc);
+            this.luceneController.Commit();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
 
             // Assert
             Assert.AreEqual(1, hits.Results.Count());
@@ -201,11 +219,11 @@ public void LuceneController_FindsResultsUsingNearRealtimeSearchWithoutCommit()
             var field = new Field(fieldName, fieldValue, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
             var doc = new Document();
             doc.Add(field);
-            this._luceneController.Add(doc);
+            this.luceneController.Add(doc);
 
             // DONOT commit here to enable testing near-realtime of search writer
             // _luceneController.Commit();
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(fieldName, "fox")) }));
 
             // Assert
             Assert.AreEqual(1, hits.Results.Count());
@@ -217,7 +235,7 @@ public void LuceneController_Search_Returns_Correct_Total_Hits()
             // Arrange
             this.AddStandardDocs();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")) }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")) }));
 
             // Assert
             Assert.AreEqual(4, hits.TotalHits);
@@ -230,7 +248,7 @@ public void LuceneController_Search_Request_For_1_Result_Returns_1_Record_But_Mo
             // Arrange
             this.AddStandardDocs();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 1 }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 1 }));
 
             // Assert
             Assert.AreEqual(4, hits.TotalHits);
@@ -243,7 +261,7 @@ public void LuceneController_Search_Request_For_4_Records_Returns_4_Records_With
             // Arrange
             this.AddStandardDocs();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 4 }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 4 }));
 
             // Assert
             Assert.AreEqual(4, hits.TotalHits);
@@ -256,7 +274,7 @@ public void LuceneController_Search_Request_For_4_Records_Returns_4_Records_With
             // Arrange
             this.AddStandardDocs();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 4 }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new TermQuery(new Term(Constants.ContentTag, "fox")), PageIndex = 1, PageSize = 4 }));
 
             // Assert
             Assert.AreEqual(4, hits.TotalHits);
@@ -269,7 +287,7 @@ public void LuceneController_Search_Request_For_NonExisting_PageNumbers_Returns_
             // Arrange
             this.AddStandardDocs();
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(
+            var hits = this.luceneController.Search(this.CreateSearchContext(
                 new LuceneQuery
                 {
                     Query = new TermQuery(new Term(Constants.ContentTag, "fox")),
@@ -295,7 +313,7 @@ public void LuceneController_Search_Request_For_PagIndex2_PageSize1_Returns_2nd_
                 PageSize = 1,
             };
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(query));
+            var hits = this.luceneController.Search(this.CreateSearchContext(query));
 
             // Assert
             Assert.AreEqual(3, hits.TotalHits);
@@ -317,27 +335,27 @@ public void LuceneController_NumericRangeCheck()
             // Add first numeric field
             var doc1 = new Document();
             doc1.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(1));
-            this._luceneController.Add(doc1);
+            this.luceneController.Add(doc1);
 
             // Add second numeric field
             var doc2 = new Document();
             doc2.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(2));
-            this._luceneController.Add(doc2);
+            this.luceneController.Add(doc2);
 
             // Add third numeric field
             var doc3 = new Document();
             doc3.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(3));
-            this._luceneController.Add(doc3);
+            this.luceneController.Add(doc3);
 
             // Add fourth numeric field
             var doc4 = new Document();
             doc4.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(4));
-            this._luceneController.Add(doc4);
+            this.luceneController.Add(doc4);
 
-            this._luceneController.Commit();
+            this.luceneController.Commit();
 
             var query = NumericRangeQuery.NewIntRange(fieldName, 2, 3, true, true);
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
             Assert.AreEqual(2, hits.Results.Count());
         }
 
@@ -353,48 +371,48 @@ public void LuceneController_DateRangeCheck()
             {
                 var doc = new Document();
                 doc.Add(new NumericField(fieldName, Field.Store.YES, true).SetLongValue(long.Parse(date.ToString(Constants.DateTimeFormat))));
-                this._luceneController.Add(doc);
+                this.luceneController.Add(doc);
             }
 
-            this._luceneController.Commit();
+            this.luceneController.Commit();
 
             var futureTime = DateTime.Now.AddMinutes(1).ToString(Constants.DateTimeFormat);
             var query = NumericRangeQuery.NewLongRange(fieldName, long.Parse(futureTime), long.Parse(futureTime), true, true);
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
             Assert.AreEqual(0, hits.Results.Count());
 
             query = NumericRangeQuery.NewLongRange(fieldName, long.Parse(DateTime.Now.AddDays(-1).ToString(Constants.DateTimeFormat)), long.Parse(DateTime.Now.ToString(Constants.DateTimeFormat)), true, true);
-            hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
+            hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
             Assert.AreEqual(1, hits.Results.Count());
 
             query = NumericRangeQuery.NewLongRange(fieldName, long.Parse(DateTime.Now.AddDays(-368).ToString(Constants.DateTimeFormat)), long.Parse(DateTime.Now.ToString(Constants.DateTimeFormat)), true, true);
-            hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
+            hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = query }));
             Assert.AreEqual(2, hits.Results.Count());
         }
 
         [Test]
         public void LuceneController_Search_Throws_On_Null_LuceneQuery()
         {
-            Assert.Throws<ArgumentNullException>(() => this._luceneController.Search(this.CreateSearchContext(null)));
+            Assert.Throws<ArgumentNullException>(() => this.luceneController.Search(this.CreateSearchContext(null)));
         }
 
         [Test]
         public void LuceneController_Search_Throws_On_Null_Query()
         {
-            Assert.Throws<ArgumentNullException>(() => this._luceneController.Search(this.CreateSearchContext(new LuceneQuery())));
+            Assert.Throws<ArgumentNullException>(() => this.luceneController.Search(this.CreateSearchContext(new LuceneQuery())));
         }
 
         [Test]
         public void LuceneController_Search_Throws_On_Zero_PageSize()
         {
-            Assert.Throws<ArgumentException>(() => this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new BooleanQuery(), PageSize = 0 })));
+            Assert.Throws<ArgumentException>(() => this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new BooleanQuery(), PageSize = 0 })));
         }
 
         [Test]
         public void LuceneController_Search_Throws_On_Zero_PageIndex()
         {
-            Assert.Throws<ArgumentException>(() => this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new BooleanQuery(), PageIndex = 0 })));
+            Assert.Throws<ArgumentException>(() => this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = new BooleanQuery(), PageIndex = 0 })));
         }
 
         [Test]
@@ -403,7 +421,7 @@ public void LuceneController_Search_Throws_On_Zero_PageIndex()
         [TestCase(ValidCustomAnalyzer)]
         public void LuceneController_Search_With_Chinese_Chars_And_Custom_Analyzer(string customAlalyzer = "")
         {
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchCustomAnalyzer, It.IsAny<string>())).Returns(customAlalyzer);
+            this.mockHostController.Setup(controller => controller.GetString(Constants.SearchCustomAnalyzer, It.IsAny<string>())).Returns(customAlalyzer);
 
             // Arrange
             const string fieldName = "content";
@@ -414,16 +432,16 @@ public void LuceneController_Search_With_Chinese_Chars_And_Custom_Analyzer(strin
             var doc = new Document();
             doc.Add(field);
 
-            this._luceneController.Add(doc);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc);
+            this.luceneController.Commit();
 
-            var analyzer = this._luceneController.GetCustomAnalyzer() ?? new SearchQueryAnalyzer(true);
+            var analyzer = this.luceneController.GetCustomAnalyzer() ?? new SearchQueryAnalyzer(true);
             var keywordQuery = new BooleanQuery();
             var parserContent = new QueryParser(Constants.LuceneVersion, fieldName, analyzer);
             var parsedQueryContent = parserContent.Parse(SearchKeyword_Chinese);
             keywordQuery.Add(parsedQueryContent, Occur.SHOULD);
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = keywordQuery }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = keywordQuery }));
 
             // Assert
             if (customAlalyzer == ValidCustomAnalyzer)
@@ -443,7 +461,7 @@ public void LuceneController_Search_With_Chinese_Chars_And_Custom_Analyzer(strin
         [TestCase(ValidCustomAnalyzer)]
         public void LuceneController_Search_With_English_Chars_And_Custom_Analyzer(string customAlalyzer = "")
         {
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchCustomAnalyzer, It.IsAny<string>())).Returns(customAlalyzer);
+            this.mockHostController.Setup(c => c.GetString(Constants.SearchCustomAnalyzer, It.IsAny<string>())).Returns(customAlalyzer);
 
             // Arrange
             const string fieldName = "content";
@@ -454,16 +472,16 @@ public void LuceneController_Search_With_English_Chars_And_Custom_Analyzer(strin
             var doc = new Document();
             doc.Add(field);
 
-            this._luceneController.Add(doc);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc);
+            this.luceneController.Commit();
 
-            var analyzer = this._luceneController.GetCustomAnalyzer() ?? new SearchQueryAnalyzer(true);
+            var analyzer = this.luceneController.GetCustomAnalyzer() ?? new SearchQueryAnalyzer(true);
             var keywordQuery = new BooleanQuery();
             var parserContent = new QueryParser(Constants.LuceneVersion, fieldName, analyzer);
             var parsedQueryContent = parserContent.Parse(SearchKeyword_Line1);
             keywordQuery.Add(parsedQueryContent, Occur.SHOULD);
 
-            var hits = this._luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = keywordQuery }));
+            var hits = this.luceneController.Search(this.CreateSearchContext(new LuceneQuery { Query = keywordQuery }));
 
             // Assert
             Assert.AreEqual(1, hits.Results.Count());
@@ -485,7 +503,7 @@ public void LuceneController_Search_Single_FuzzyQuery()
 
             // Act
             var luceneQuery = new LuceneQuery { Query = new FuzzyQuery(new Term(Constants.ContentTag, keyword)) };
-            var previews = this._luceneController.Search(this.CreateSearchContext(luceneQuery));
+            var previews = this.luceneController.Search(this.CreateSearchContext(luceneQuery));
 
             // Assert
             Assert.AreEqual(2, previews.Results.Count());
@@ -519,7 +537,7 @@ public void LuceneController_Search_Double_FuzzyQuery()
             }
 
             var luceneQuery = new LuceneQuery { Query = finalQuery };
-            var previews = this._luceneController.Search(this.CreateSearchContext(luceneQuery));
+            var previews = this.luceneController.Search(this.CreateSearchContext(luceneQuery));
 
             // Assert
             Assert.AreEqual(3, previews.Results.Count());
@@ -528,7 +546,7 @@ public void LuceneController_Search_Double_FuzzyQuery()
         [Test]
         public void LuceneController_Throws_SearchIndexEmptyException_WhenNoDataInSearch()
         {
-            Assert.Throws<SearchIndexEmptyException>(() => { var r = this._luceneController.GetSearcher(); });
+            Assert.Throws<SearchIndexEmptyException>(() => { var r = this.luceneController.GetSearcher(); });
         }
 
         [Test]
@@ -542,13 +560,13 @@ public void LuceneController_ReaderNotChangedBeforeTimeSpanElapsed()
             // Add first numeric field
             var doc1 = new Document();
             doc1.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(1));
-            this._luceneController.Add(doc1);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc1);
+            this.luceneController.Commit();
 
-            var reader = this._luceneController.GetSearcher();
-            Thread.Sleep(TimeSpan.FromSeconds(this._readerStaleTimeSpan / 2));
+            var reader = this.luceneController.GetSearcher();
+            Thread.Sleep(TimeSpan.FromSeconds(this.readerStaleTimeSpan / 2));
 
-            Assert.AreSame(reader, this._luceneController.GetSearcher());
+            Assert.AreSame(reader, this.luceneController.GetSearcher());
         }
 
         [Test]
@@ -562,13 +580,13 @@ public void LuceneController_ReaderNotChangedIfNoIndexUpdated()
             // Add first numeric field
             var doc1 = new Document();
             doc1.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(1));
-            this._luceneController.Add(doc1);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc1);
+            this.luceneController.Commit();
 
-            var reader = this._luceneController.GetSearcher();
-            Thread.Sleep(TimeSpan.FromSeconds(this._readerStaleTimeSpan * 1.1));
+            var reader = this.luceneController.GetSearcher();
+            Thread.Sleep(TimeSpan.FromSeconds(this.readerStaleTimeSpan * 1.1));
 
-            Assert.AreSame(reader, this._luceneController.GetSearcher());
+            Assert.AreSame(reader, this.luceneController.GetSearcher());
         }
 
         [Test]
@@ -582,20 +600,20 @@ public void LuceneController_ReaderIsChangedWhenIndexIsUpdatedAndTimeIsElapsed()
             // Add first numeric field
             var doc1 = new Document();
             doc1.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(1));
-            this._luceneController.Add(doc1);
-            this._luceneController.Commit();
+            this.luceneController.Add(doc1);
+            this.luceneController.Commit();
 
-            var reader = this._luceneController.GetSearcher();
-            Thread.Sleep(TimeSpan.FromSeconds(this._readerStaleTimeSpan * 1.1));
+            var reader = this.luceneController.GetSearcher();
+            Thread.Sleep(TimeSpan.FromSeconds(this.readerStaleTimeSpan * 1.1));
 
             // Add second numeric field
             var doc2 = new Document();
             doc2.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(2));
-            this._luceneController.Add(doc2);
+            this.luceneController.Add(doc2);
 
             // var lastAcccess = Directory.GetLastWriteTime(_luceneController.IndexFolder);
             // Directory.SetLastWriteTime(_luceneController.IndexFolder, lastAcccess + TimeSpan.FromSeconds(1));
-            Assert.AreNotSame(reader, this._luceneController.GetSearcher());
+            Assert.AreNotSame(reader, this.luceneController.GetSearcher());
         }
 
         [Test]
@@ -620,7 +638,7 @@ public void LuceneController_LockFileWhenExistsDoesNotCauseProblemForFirstIContr
 
             // Assert
             Assert.True(File.Exists(lockFile));
-            Assert.DoesNotThrow(() => this._luceneController.Add(doc1));
+            Assert.DoesNotThrow(() => this.luceneController.Add(doc1));
         }
 
         [Test]
@@ -633,7 +651,7 @@ public void LuceneController_LockFileCanBeObtainedByOnlySingleController()
             // Act
             var doc1 = new Document();
             doc1.Add(new NumericField(fieldName, Field.Store.YES, true).SetIntValue(1));
-            this._luceneController.Add(doc1);
+            this.luceneController.Add(doc1);
 
             // create another controller then try to access the already locked index by the first one
             var secondController = new LuceneControllerImpl();
@@ -648,8 +666,8 @@ public void LuceneController_DocumentMaxAndCountAreCorrect()
         {
             this.AddTestDocs();
 
-            Assert.AreEqual(TotalTestDocs2Create, this._luceneController.MaxDocsCount());
-            Assert.AreEqual(TotalTestDocs2Create, this._luceneController.SearchbleDocsCount());
+            Assert.AreEqual(TotalTestDocs2Create, this.luceneController.MaxDocsCount());
+            Assert.AreEqual(TotalTestDocs2Create, this.luceneController.SearchbleDocsCount());
         }
 
         [Test]
@@ -659,9 +677,9 @@ public void LuceneController_TestDeleteBeforeOptimize()
             this.AddTestDocs();
             var delCount = this.DeleteTestDocs();
 
-            Assert.IsTrue(this._luceneController.HasDeletions());
-            Assert.AreEqual(TotalTestDocs2Create, this._luceneController.MaxDocsCount());
-            Assert.AreEqual(TotalTestDocs2Create - delCount, this._luceneController.SearchbleDocsCount());
+            Assert.IsTrue(this.luceneController.HasDeletions());
+            Assert.AreEqual(TotalTestDocs2Create, this.luceneController.MaxDocsCount());
+            Assert.AreEqual(TotalTestDocs2Create - delCount, this.luceneController.SearchbleDocsCount());
         }
 
         [Test]
@@ -671,10 +689,10 @@ public void LuceneController_TestDeleteAfterOptimize()
             this.AddTestDocs();
             var delCount = this.DeleteTestDocs();
 
-            this._luceneController.OptimizeSearchIndex(true);
+            this.luceneController.OptimizeSearchIndex(true);
 
-            Assert.AreEqual(TotalTestDocs2Create, this._luceneController.MaxDocsCount());
-            Assert.AreEqual(TotalTestDocs2Create - delCount, this._luceneController.SearchbleDocsCount());
+            Assert.AreEqual(TotalTestDocs2Create, this.luceneController.MaxDocsCount());
+            Assert.AreEqual(TotalTestDocs2Create - delCount, this.luceneController.SearchbleDocsCount());
         }
 
         [Test]
@@ -683,7 +701,7 @@ public void LuceneController_TestGetSearchStatistics()
             // Arrange
             var addedCount = this.AddTestDocs();
             var delCount = this.DeleteTestDocs();
-            var statistics = this._luceneController.GetSearchStatistics();
+            var statistics = this.luceneController.GetSearchStatistics();
 
             Assert.IsNotNull(statistics);
             Assert.AreEqual(statistics.TotalDeletedDocuments, delCount);
@@ -698,19 +716,19 @@ public void SearchController_LuceneControllerReaderIsNotNullWhenWriterIsNull()
             this.CreateNewLuceneControllerInstance(); // to force a new reader for the next assertion
 
             // Assert
-            Assert.IsNotNull(this._luceneController.GetSearcher());
+            Assert.IsNotNull(this.luceneController.GetSearcher());
         }
 
         private void CreateNewLuceneControllerInstance()
         {
-            if (this._luceneController != null)
+            if (this.luceneController != null)
             {
                 LuceneController.ClearInstance();
-                this._luceneController.Dispose();
+                this.luceneController.Dispose();
             }
 
-            this._luceneController = new LuceneControllerImpl();
-            LuceneController.SetTestableInstance(this._luceneController);
+            this.luceneController = new LuceneControllerImpl();
+            LuceneController.SetTestableInstance(this.luceneController);
         }
 
         private IList<string> GetSynonymsCallBack(int portalId, string cultureCode, string term)
@@ -759,10 +777,10 @@ private void AddLinesAsSearchDocs(IEnumerable<string> lines)
                 var field = new Field(Constants.ContentTag, line, Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
                 var doc = new Document();
                 doc.Add(field);
-                this._luceneController.Add(doc);
+                this.luceneController.Add(doc);
             }
 
-            this._luceneController.Commit();
+            this.luceneController.Commit();
         }
 
         private int AddTestDocs()
@@ -774,10 +792,10 @@ private int AddTestDocs()
 
                 // format to "D#" because LengthFilter will not consider words of length < 3 or > 255 characters in length (defaults)
                 doc.Add(new Field(ContentFieldName, i.ToString("D" + Constants.DefaultMinLen), Field.Store.YES, Field.Index.ANALYZED));
-                this._luceneController.Add(doc);
+                this.luceneController.Add(doc);
             }
 
-            this._luceneController.Commit();
+            this.luceneController.Commit();
             return TotalTestDocs2Create;
         }
 
@@ -789,17 +807,17 @@ private int DeleteTestDocs()
             for (var i = 1; i < TotalTestDocs2Create; i += 2)
             {
                 // format to "D#" because LengthFilter will not consider the defaults for these values
-                this._luceneController.Delete(new TermQuery(new Term(ContentFieldName, i.ToString("D" + Constants.DefaultMinLen))));
+                this.luceneController.Delete(new TermQuery(new Term(ContentFieldName, i.ToString("D" + Constants.DefaultMinLen))));
                 delCount++;
             }
 
-            this._luceneController.Commit();
+            this.luceneController.Commit();
             return delCount;
         }
 
         private LuceneSearchContext CreateSearchContext(LuceneQuery luceneQuery)
         {
-            return new LuceneSearchContext { LuceneQuery = luceneQuery, SearchQuery = this._mockSearchQuery.Object };
+            return new LuceneSearchContext { LuceneQuery = luceneQuery, SearchQuery = this.mockSearchQuery.Object };
         }
     }
 }
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs
index c8f6ce90b60..decd86551ad 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs	
@@ -2,2993 +2,2998 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Search
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.IO;
-    using System.Linq;
+namespace DotNetNuke.Tests.Core.Controllers.Search
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.IO;
+    using System.Linq;
     using System.Threading;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Localization;
-    using DotNetNuke.Services.Search.Controllers;
-    using DotNetNuke.Services.Search.Entities;
-    using DotNetNuke.Services.Search.Internals;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Lucene.Net.Documents;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Localization;
+    using DotNetNuke.Services.Search.Controllers;
+    using DotNetNuke.Services.Search.Entities;
+    using DotNetNuke.Services.Search.Internals;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
     using Microsoft.Extensions.DependencyInjection;
-    using Moq;
-    using NUnit.Framework;
-
-    using Constants = DotNetNuke.Services.Search.Internals.Constants;
-
-    /// <summary>
-    ///  Testing various aspects of SearchController.
-    /// </summary>
-    [TestFixture]
-    public class SearchControllerTests
-    {
-        private const int ModuleSearchTypeId = (int)SearchTypeIds.ModuleSearchTypeId;
-        private const int TabSearchTypeId = (int)SearchTypeIds.TabSearchTypeId;
-        private const int DocumentSearchTypeId = (int)SearchTypeIds.DocumentSearchTypeId;
-        private const int UrlSearchTypeId = (int)SearchTypeIds.UrlSearchTypeId;
-        private const int OtherSearchTypeId = (int)SearchTypeIds.OtherSearchTypeId;
-        private const int UnknownSearchTypeId = (int)SearchTypeIds.UnknownSearchTypeId;
-        private const int PortalId0 = 0;
-        private const int PortalId12 = 12;
-        private const int IdeasModuleDefId = 201;
-        private const int BlogsoduleDefId = 202;
-        private const int AnswersModuleDefId = 203;
-        private const int HtmlModuleDefId = 20;
-        private const int HtmlModuleId = 25;
-        private const int IdeasModuleId = 301;
-        private const int BlogsModuleId = 302;
-        private const int AnswersModuleId = 303;
-        private const int RoleId731 = 731;
-        private const int RoleId532 = 532;
-        private const int RoleId0 = 0;
-        private const string Tag0 = "tag0";
-        private const string Tag0WithSpace = "tag0 hello";
-        private const string Tag1 = "tag1";
-        private const string Tag2 = "tag2";
-        private const string Tag3 = "tag3";
-        private const string Tag4 = "tag4";
-        private const string TagTootsie = "tootsie";
-        private const string TagLatest = "latest";
-        private const string TagOldest = "oldest";
-        private const string TagIt = "IT";
-        private const string TagNeutral = "Neutral";
-        private const string ModuleSearchTypeName = "module";
-        private const string OtherSearchTypeName = "other";
-        private const string TabSearchTypeName = "tab";
-        private const string DocumentSearchTypeName = "document";
-        private const string UrlSearchTypeName = "url";
-        private const string ModuleResultControllerClass = "DotNetNuke.Services.Search.Crawlers.ModuleResultController, DotNetNuke";
-        private const string FakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.FakeResultController, DotNetNuke.Tests.Core";
-        private const string NoPermissionFakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.NoPermissionFakeResultController, DotNetNuke.Tests.Core";
-        private const string CultureEnUs = "en-US";
-        private const string CultureEnCa = "en-CA";
-        private const string CultureItIt = "it-IT";
-        private const string CultureEsEs = "es-ES";
-        private const int LanguageIdEnUs = 1;
-        private const int LanguageIdEnFr = 2;
-        private const int LanguageIdItIt = 3;
-        private const int LanguageIdEsEs = 4;
-        private const int StandardAuthorId = 55;
-        private const int StandardRoleId = 66;
-        private const string StandardAuthorDisplayName = "Standard User";
-        private const int StandardTabId = 99;
-        private const string StandardPermission = "!Translator (en-US);![4];[5];[6];Administrators;ContentEditorRole;";
-        private const string StandardQueryString = "cid=1";
-        private const string NumericKey1 = "numerickey1";
-        private const string NumericKey2 = "numerickey2";
-        private const int NumericValue1 = 77777;
-        private const int NumericValue2 = 55555;
-        private const int NumericValue50 = 50;
-        private const int NumericValue100 = 100;
-        private const int NumericValue200 = 200;
-        private const int NumericValue500 = 500;
-        private const int NumericValue1000 = 1000;
-        private const string KeyWord1Name = "keyword1";
-        private const string KeyWord1Value = "value1";
-        private const string KeyWord2Name = "keyword2";
-        private const string KeyWord2Value = "value2";
-        private const string KeyWord3Value = "value3";
-        private const string KeyWord4Value = "value4";
-        private const string KeyWord5Value = "value5";
-        private const string Line1 = "The quick brown fox jumps over the lazy dog";
-        private const string Line2 = "The quick gold fox jumped over the lazy black dog";
-        private const string Line3 = "the quick fox jumps over the black dog - Italian";
-        private const string Line4 = "the red fox jumped over the lazy dark gray dog";
-        private const string Line5 = "the quick fox jumps over the white dog - los de el Espana";
-
-        private const int CustomBoost = 80;
-
-        private const string SearchIndexFolder = @"App_Data\SearchTests";
-        private const int DefaultSearchRetryTimes = 5;
-        private readonly double _readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
-        private Mock<IHostController> _mockHostController;
-        private Mock<CachingProvider> _mockCachingProvider;
-        private Mock<DataProvider> _mockDataProvider;
-        private Mock<ILocaleController> _mockLocaleController;
-        private Mock<ISearchHelper> _mockSearchHelper;
-        private Mock<IUserController> _mockUserController;
-
-        private SearchControllerImpl _searchController;
-        private IInternalSearchController _internalSearchController;
-        private LuceneControllerImpl _luceneController;
-
-        public enum SearchTypeIds
-        {
-            ModuleSearchTypeId = 1,
-            TabSearchTypeId,
-            DocumentSearchTypeId,
-            UrlSearchTypeId,
-            OtherSearchTypeId,
-            UnknownSearchTypeId,
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            ComponentFactory.Container = new SimpleContainer();
-            MockComponentProvider.ResetContainer();
-
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            this._mockDataProvider = MockComponentProvider.CreateDataProvider();
-            this._mockLocaleController = MockComponentProvider.CreateLocaleController();
-            this._mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
-
-            this._mockUserController = new Mock<IUserController>();
-            this._mockHostController = new Mock<IHostController>();
-            this._mockSearchHelper = new Mock<ISearchHelper>();
-
-            this.SetupDataProvider();
-            this.SetupHostController();
-            this.SetupSearchHelper();
-            this.SetupLocaleController();
-
-            this._mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>())).Returns((int portalId, int userId) => this.GetUserByIdCallback(portalId, userId));
-            UserController.SetTestableInstance(this._mockUserController.Object);
-
-            this.CreateNewLuceneControllerInstance();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            this._luceneController.Dispose();
-            this.DeleteIndexFolder();
-            InternalSearchController.ClearInstance();
-            UserController.ClearInstance();
-            SearchHelper.ClearInstance();
-            LuceneController.ClearInstance();
-            this._luceneController = null;
-            Globals.DependencyProvider = null;
-        }
-
-        [Test]
-        public void SearchController_Search_Throws_On_Null_Query()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => this._searchController.SiteSearch(null));
-        }
-
-        [Test]
-        public void SearchController_Search_Throws_On_Empty_TypeId_Collection()
-        {
-            // Arrange
-
-            // Act, Assert
-            Assert.Throws<ArgumentException>(() => this._searchController.SiteSearch(new SearchQuery { KeyWords = "word" }));
-        }
-
-        [Test]
-        public void SearchController_AddSearchDcoumet_Regex_Does_Not_Sleep_On_Bad_Text_During_Alt_Text_Parsing()
-        {
-            // Arrange
-            var document = new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "<<Click here for the complete city listing by a... ", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act, Assert
-            this._internalSearchController.AddSearchDocument(document);
-        }
-
-        [Test]
-        public void SearchController_AddSearchDcoumet_Regex_Does_Not_Sleep_On_Bad_Text_During_Alt_Text_Parsing2()
-        {
-            // Arrange
-            var document = new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "<<Click here for the complete city listing by a... ", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act, Assert
-            Assert.DoesNotThrow(() => ExecuteWithTimeout(
-                    () =>
-                    {
-                        this._internalSearchController.AddSearchDocument(document);
-                        return false;
-                    }, TimeSpan.FromSeconds(1)));
-        }
-
-        [Test]
-        public void SearchController_Added_Item_IsRetrieved()
-        {
-            // Arrange
-            var doc = new SearchDocument { UniqueKey = "key01", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc);
-
-            var result = this.SearchForKeyword("hello");
-
-            // Assert
-            Assert.AreEqual(1, result.Results.Count);
-            Assert.AreEqual(result.Results[0].UniqueKey, doc.UniqueKey);
-            Assert.AreEqual(result.Results[0].Title, doc.Title);
-        }
-
-        [Test]
-        public void SearchController_EnsureIndexIsAppended_When_Index_Is_NotDeleted_InBetween()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                };
-
-            // Act
-
-            // Add first document
-            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = Guid.NewGuid().ToString(), SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            // first luceneQuery
-            var query1 = new SearchQuery { KeyWords = "fox", SearchTypeIds = new List<int> { OtherSearchTypeId } };
-            var search1 = this._searchController.SiteSearch(query1);
-
-            // Assert
-            Assert.AreEqual(1, search1.Results.Count);
-
-            // Add second document
-            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = Guid.NewGuid().ToString(), SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc2);
-            this.CreateNewLuceneControllerInstance(); // to force a new reader for the next assertion
-
-            // second luceneQuery
-            var query2 = new SearchQuery { KeyWords = "fox", SearchTypeIds = new List<int> { OtherSearchTypeId } };
-            var search2 = this._searchController.SiteSearch(query2);
-
-            // Assert
-            Assert.AreEqual(2, search2.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_Getsearch_TwoTermsSearch()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                Line3,
-                Line4,
-                Line5,
-                };
-
-            this.AddLinesAsSearchDocs(docs);
-
-            // Act
-            var search = this.SearchForKeyword("fox jumps");
-
-            // Assert
-            Assert.AreEqual(docs.Length, search.Results.Count);
-
-            // Assert.AreEqual("brown <b>fox jumps</b> over the lazy dog ", search.Results[0].Snippet);
-            // Assert.AreEqual("quick <b>fox jumps</b> over the black dog ", search.Results[1].Snippet);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TwoTermsSearch()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                Line3,
-                Line4,
-                Line5,
-                };
-
-            this.AddLinesAsSearchDocs(docs);
-
-            // Act
-            var search = this.SearchForKeyword("fox jumps");
-
-            // Assert
-            Assert.AreEqual(docs.Length, search.Results.Count);
-
-            // Assert.AreEqual("brown <b>fox jumps</b> over the lazy dog ", search.Results[0].Snippet);
-            // Assert.AreEqual("quick <b>fox jumps</b> over the black dog ", search.Results[1].Snippet);
-        }
-
-        [Test]
-        public void SearchController_GetResult_PortalIdSearch()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, PortalIds = new List<int> { PortalId0 } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_SearchTypeIdSearch()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_SearchFindsAnalyzedVeryLongWords()
-        {
-            // Arrange
-            // const string fieldName = Constants.ContentTag;
-            const string veryLongWord = // 107 characters
-                "NowIsTheTimeForAllGoodMenToComeToTheAidOfTheirCountryalsoIsTheTimeForAllGoodMenToComeToTheAidOfTheirCountry";
-
-            var doc = new SearchDocument
-            {
-                Title = veryLongWord,
-                UniqueKey = Guid.NewGuid().ToString(),
-                SearchTypeId = ModuleSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                ModuleId = 1,
-                ModuleDefId = 1,
-            };
-            this._internalSearchController.AddSearchDocument(doc);
-
-            // Act
-            var query = new SearchQuery { KeyWords = veryLongWord, SearchTypeIds = new List<int> { ModuleSearchTypeId } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual("<b>" + veryLongWord + "</b>", this.StipEllipses(search.Results[0].Snippet).Trim());
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsNoResultsWhenHavingNoPermission()
-        {
-            // Arrange
-            this.AddStandardSearchDocs(DocumentSearchTypeId);
-
-            // Act
-            var result = this.SearchForKeyword("fox", DocumentSearchTypeId);
-
-            // Assert
-            // by default AuthorUserId = 0 which have no permission, so this passes
-            Assert.AreEqual(0, result.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1A()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 1,
-                PageSize = 4,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(query.PageSize, result.Results.Count);
-            Assert.AreEqual(new[] { 6, 7, 8, 9 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1B()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 1,
-                PageSize = 6,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(query.PageSize, result.Results.Count);
-            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1C()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 1,
-                PageSize = 8,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(query.PageSize, result.Results.Count);
-            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17, 18, 19 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1D()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId; // user should have access to some documnets here
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 1,
-                PageSize = 100,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(4 * 3, result.TotalHits);
-            Assert.AreEqual(4 * 3, result.Results.Count);
-            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17, 18, 19, 26, 27, 28, 29 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1E()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = TabSearchTypeId; // user should have access to all documnets here
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 1,
-                PageSize = 10,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).Skip(1).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs, result.TotalHits);
-            Assert.AreEqual(query.PageSize, result.Results.Count);
-            Assert.AreEqual(Enumerable.Range(1, 9).ToArray(), ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1F()
-        {
-            // Arrange
-            const int maxDocs = 100;
-            const int stype = TabSearchTypeId; // user should have access to all documnets here
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 10,
-                PageSize = 10,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs, result.TotalHits);
-            Assert.AreEqual(query.PageSize, result.Results.Count);
-            Assert.AreEqual(Enumerable.Range(90, 10).ToArray(), ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2A()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 2,
-                PageSize = 5,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(5, result.Results.Count);
-            Assert.AreEqual(new[] { 17, 18, 19, 26, 27 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2B()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 2,
-                PageSize = 6,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(6, result.Results.Count);
-            Assert.AreEqual(new[] { 18, 19, 26, 27, 28, 29 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2C()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var query = new SearchQuery
-            {
-                PageIndex = 2,
-                PageSize = 8,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(query);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(4, result.Results.Count);
-            Assert.AreEqual(new[] { 26, 27, 28, 29 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3A()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var queryPg3 = new SearchQuery
-            {
-                PageIndex = 3,
-                PageSize = 4,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(queryPg3);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(queryPg3.PageSize, result.Results.Count);
-            Assert.AreEqual(new[] { 26, 27, 28, 29 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3B()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var queryPg3 = new SearchQuery
-            {
-                PageIndex = 3,
-                PageSize = 5,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(queryPg3);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(2, result.Results.Count);
-            Assert.AreEqual(new[] { 28, 29 }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3C()
-        {
-            // Arrange
-            const int maxDocs = 30;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var queryPg3 = new SearchQuery
-            {
-                PageIndex = 3,
-                PageSize = 8,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(queryPg3);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - 18, result.TotalHits);
-            Assert.AreEqual(0, result.Results.Count);
-            Assert.AreEqual(new int[] { }, ids);
-        }
-
-        [Test]
-        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage5()
-        {
-            // Arrange
-            const int maxDocs = 100;
-            const int stype = DocumentSearchTypeId;
-            this.SetupSecurityTrimmingDocs(maxDocs, stype);
-
-            // Act
-            var queryPg3 = new SearchQuery
-            {
-                PageIndex = 5,
-                PageSize = 8,
-                KeyWords = "fox",
-                SearchTypeIds = new[] { stype },
-            };
-
-            var result = this._searchController.SiteSearch(queryPg3);
-            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
-
-            // Assert
-            Assert.AreEqual(maxDocs - (10 * 6), result.TotalHits);
-            Assert.AreEqual(queryPg3.PageSize, result.Results.Count);
-            Assert.AreEqual(new int[] { 86, 87, 88, 89, 96, 97, 98, 99 }, ids);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Returns_Correct_SuppliedData_When_Optionals_Are_Supplied()
-        {
-            // Arrange
-            var modifiedDateTime = DateTime.UtcNow;
-            var numericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue1 }, { NumericKey2, NumericValue2 } };
-            var keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value }, { KeyWord2Name, KeyWord2Value } };
-            var tags = new List<string> { Tag1, Tag2 };
-            var doc = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key",
-                SearchTypeId = ModuleSearchTypeId,
-                ModifiedTimeUtc = modifiedDateTime,
-                PortalId = PortalId12,
-                TabId = StandardTabId,
-                ModuleDefId = HtmlModuleDefId,
-                ModuleId = HtmlModuleId,
-                Description = "Description",
-                Body = "Body",
-                AuthorUserId = StandardAuthorId,
-                RoleId = StandardRoleId,
-                Permissions = StandardPermission,
-                QueryString = StandardQueryString,
-                Tags = tags,
-                NumericKeys = numericKeys,
-                Keywords = keywords,
-            };
-            this._internalSearchController.AddSearchDocument(doc);
-
-            // run luceneQuery on common keyword between both the docs
-            var search = this.SearchForKeywordInModule("Title");
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(PortalId12, search.Results[0].PortalId);
-            Assert.AreEqual(StandardTabId, search.Results[0].TabId);
-            Assert.AreEqual(HtmlModuleDefId, search.Results[0].ModuleDefId);
-            Assert.AreEqual(HtmlModuleId, search.Results[0].ModuleId);
-            Assert.AreEqual(ModuleSearchTypeId, search.Results[0].SearchTypeId);
-            Assert.AreEqual("Description", search.Results[0].Description);
-            Assert.AreEqual("Body", search.Results[0].Body);
-            Assert.AreEqual(StandardAuthorId, search.Results[0].AuthorUserId);
-            Assert.AreEqual(StandardRoleId, search.Results[0].RoleId);
-            Assert.AreEqual(modifiedDateTime.ToString(Constants.DateTimeFormat), search.Results[0].ModifiedTimeUtc.ToString(Constants.DateTimeFormat));
-            Assert.AreEqual(StandardPermission, search.Results[0].Permissions);
-            Assert.AreEqual(StandardQueryString, search.Results[0].QueryString);
-            Assert.AreEqual(StandardAuthorDisplayName, search.Results[0].AuthorName);
-            Assert.AreEqual(tags.Count, search.Results[0].Tags.Count());
-            Assert.AreEqual(tags[0], search.Results[0].Tags.ElementAt(0));
-            Assert.AreEqual(tags[1], search.Results[0].Tags.ElementAt(1));
-            Assert.AreEqual(numericKeys.Count, search.Results[0].NumericKeys.Count);
-            Assert.AreEqual(numericKeys[NumericKey1], search.Results[0].NumericKeys[NumericKey1]);
-            Assert.AreEqual(numericKeys[NumericKey2], search.Results[0].NumericKeys[NumericKey2]);
-            Assert.AreEqual(keywords.Count, search.Results[0].Keywords.Count);
-            Assert.AreEqual(keywords[KeyWord1Name], search.Results[0].Keywords[KeyWord1Name]);
-            Assert.AreEqual(keywords[KeyWord2Name], search.Results[0].Keywords[KeyWord2Name]);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Returns_EmptyData_When_Optionals_Are_Not_Supplied()
-        {
-            // Arrange
-            var modifiedDateTime = DateTime.UtcNow;
-            var doc = new SearchDocument
-            {
-                PortalId = PortalId0,
-                Title = "Title",
-                UniqueKey = "key",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = modifiedDateTime,
-            };
-            this._internalSearchController.AddSearchDocument(doc);
-
-            var search = this.SearchForKeyword("Title");
-
-            // Assert -
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(PortalId0, search.Results[0].PortalId);
-            Assert.AreEqual(0, search.Results[0].TabId);
-            Assert.AreEqual(0, search.Results[0].ModuleDefId);
-            Assert.AreEqual(0, search.Results[0].ModuleId);
-            Assert.AreEqual(OtherSearchTypeId, search.Results[0].SearchTypeId);
-            Assert.AreEqual(null, search.Results[0].Description);
-            Assert.AreEqual(null, search.Results[0].Body);
-            Assert.AreEqual(0, search.Results[0].AuthorUserId);
-            Assert.AreEqual(-1, search.Results[0].RoleId);
-            Assert.AreEqual(modifiedDateTime.ToString(Constants.DateTimeFormat), search.Results[0].ModifiedTimeUtc.ToString(Constants.DateTimeFormat));
-            Assert.AreEqual(null, search.Results[0].Permissions);
-            Assert.AreEqual(null, search.Results[0].QueryString);
-            Assert.AreEqual(null, search.Results[0].AuthorName);
-            Assert.AreEqual(0, search.Results[0].Tags.Count());
-            Assert.AreEqual(0, search.Results[0].NumericKeys.Count);
-            Assert.AreEqual(0, search.Results[0].Keywords.Count);
-        }
-
-        [Test]
-        public void SearchController_GetsHighlightedDesc()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                Line3,
-                Line4,
-                Line5,
-                };
-            this.AddLinesAsSearchDocs(docs);
-
-            // Act
-            var search = this.SearchForKeyword("fox");
-
-            // Assert
-            Assert.AreEqual(docs.Length, search.Results.Count);
-            Assert.IsTrue(
-                new[]
-                {
-                  "brown <b>fox</b> jumps over the lazy dog",
-                  "quick <b>fox</b> jumps over the black dog - Italian",
-                  "gold <b>fox</b> jumped over the lazy black dog",
-                  "e red <b>fox</b> jumped over the lazy dark gray dog",
-                  "quick <b>fox</b> jumps over the white dog - los de el Espana",
-                }.SequenceEqual(search.Results.Select(r => this.StipEllipses(r.Snippet))),
-                "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Snippet)));
-        }
-
-        [Test]
-        public void SearchController_CorrectDocumentCultureIsUsedAtIndexing()
-        {
-            // Arrange
-            // assign a culture that is different than the current one
-            var isNonEnglishEnv = Thread.CurrentThread.CurrentCulture.Name != CultureEsEs;
-            string cultureCode, title, searchWord;
-
-            // Act
-            if (isNonEnglishEnv)
-            {
-                cultureCode = CultureEsEs;
-                searchWord = "zorro";
-                title = "los rápidos saltos de zorro sobre el perro negro";
-            }
-            else
-            {
-                cultureCode = CultureEnUs;
-                searchWord = "fox";
-                title = Line3;
-            }
-
-            this._internalSearchController.AddSearchDocument(
-                new SearchDocument
-                {
-                    Title = title,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = OtherSearchTypeId,
-                    ModifiedTimeUtc = DateTime.UtcNow,
-                    CultureCode = cultureCode,
-                });
-            this._internalSearchController.Commit();
-
-            var searches = this.SearchForKeyword(searchWord);
-
-            // Assert
-            Assert.AreEqual(1, searches.TotalHits);
-            Assert.AreEqual(cultureCode, searches.Results[0].CultureCode);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TimeRangeSearch_Ignores_When_Only_BeginDate_Specified()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, BeginModifiedTimeUtc = DateTime.Now };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TimeRangeSearch_Resturns_Scoped_Results_When_BeginDate_Is_After_End_Date()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                BeginModifiedTimeUtc = DateTime.Now,
-                EndModifiedTimeUtc = DateTime.Now.AddSeconds(-1),
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TimeRangeSearch_Resturns_Scoped_Results_When_Both_Dates_Specified()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-            var stypeIds = new List<int> { ModuleSearchTypeId };
-            var utcNow = DateTime.UtcNow.AddDays(1);
-            const SortFields sfield = SortFields.LastModified;
-
-            // Act and Assert - just a bit later
-            var query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddSeconds(1), EndModifiedTimeUtc = utcNow.AddDays(1) };
-            var search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(0, search.Results.Count);
-
-            // Act and Assert - 10 day
-            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-10), EndModifiedTimeUtc = utcNow.AddDays(1) };
-            search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(Line5, search.Results[0].Title);
-
-            // Act and Assert - 1 year or so
-            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-368), EndModifiedTimeUtc = utcNow.AddDays(1) };
-            search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(2, search.Results.Count);
-            Assert.AreEqual(Line5, search.Results[0].Title);
-            Assert.AreEqual(Line4, search.Results[1].Title);
-
-            // Act and Assert - 2 years or so
-            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-800), EndModifiedTimeUtc = utcNow.AddDays(1) };
-            search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(3, search.Results.Count);
-            Assert.AreEqual(Line5, search.Results[0].Title);
-            Assert.AreEqual(Line4, search.Results[1].Title);
-            Assert.AreEqual(Line3, search.Results[2].Title);
-
-            // Act and Assert - 3 years or so
-            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-1200), EndModifiedTimeUtc = utcNow.AddDays(1) };
-            search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(4, search.Results.Count);
-            Assert.AreEqual(Line5, search.Results[0].Title);
-            Assert.AreEqual(Line4, search.Results[1].Title);
-            Assert.AreEqual(Line3, search.Results[2].Title);
-            Assert.AreEqual(Line2, search.Results[3].Title);
-
-            // Act and Assert - 2 to 3 years or so
-            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-1200), EndModifiedTimeUtc = utcNow.AddDays(-800) };
-            search = this._searchController.SiteSearch(query);
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(Line2, search.Results[0].Title);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Single_Tag_Returns_Single_Result()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0 } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Single_Tag_With_Space_Returns_Single_Result()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0WithSpace } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Lowercase_Search_Returns_PropercaseTag_Single_Result()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { TagNeutral.ToLowerInvariant() } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Single_Tag_Returns_Two_Results()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag1 } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(2, search.Results.Count);
-            Assert.AreEqual(Tag0, search.Results[0].Tags.ElementAt(0));
-            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(1));
-            Assert.AreEqual(Tag1, search.Results[1].Tags.ElementAt(0));
-            Assert.AreEqual(Tag2, search.Results[1].Tags.ElementAt(1));
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Two_Tags_Returns_Nothing()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0, Tag4 } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(0, search.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_Two_Tags_Returns_Single_Results()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag1, Tag2 } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(0));
-            Assert.AreEqual(Tag2, search.Results[0].Tags.ElementAt(1));
-        }
-
-        [Test]
-        public void SearchController_GetResult_TagSearch_With_Vowel_Tags_Returns_Data()
-        {
-            // Arrange
-            const string keyword = "awesome";
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { TagTootsie } };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, Tags = new List<string> { TagTootsie } };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_GetResult_Throws_When_CustomNumericField_Is_Specified_And_CustomSortField_Is_Not()
-        {
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomNumericField,
-            };
-
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_GetResult_Throws_When_CustomStringField_Is_Specified_And_CustomSortField_Is_Not()
-        {
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomStringField,
-            };
-
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_GetResult_Throws_When_NumericKey_Is_Specified_And_CustomSortField_Is_Not()
-        {
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.NumericKey,
-            };
-
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_GetResult_Throws_When_Keyword_Is_Specified_And_CustomSortField_Is_Not()
-        {
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Keyword,
-            };
-
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Date_Returns_Latest_Docs_First()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.LastModified,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
-
-            Assert.AreEqual(Tag3, search.Results[1].Tags.ElementAt(0));
-            Assert.AreEqual(Tag4, search.Results[1].Tags.ElementAt(1));
-            Assert.AreEqual(TagLatest, search.Results[1].Tags.ElementAt(2));
-
-            Assert.AreEqual(Tag2, search.Results[0].Tags.ElementAt(0));
-            Assert.AreEqual(Tag3, search.Results[0].Tags.ElementAt(1));
-            Assert.AreEqual(TagIt.ToLowerInvariant(), search.Results[0].Tags.ElementAt(2));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Date_Ascending_Returns_Earliest_Docs_First()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.LastModified,
-                SortDirection = SortDirections.Ascending,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.Greater(search.Results[1].DisplayModifiedTime, search.Results[0].DisplayModifiedTime);
-            Assert.Greater(search.Results[2].DisplayModifiedTime, search.Results[1].DisplayModifiedTime);
-            Assert.Greater(search.Results[3].DisplayModifiedTime, search.Results[2].DisplayModifiedTime);
-
-            Assert.AreEqual(Tag0, search.Results[0].Tags.ElementAt(0));
-            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(1));
-            Assert.AreEqual(TagOldest, search.Results[0].Tags.ElementAt(2));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_NumericKeys_Ascending_Returns_Smaller_Numers_First()
-        {
-            var added = this.AddDocumentsWithNumericKeys();
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "Title",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.NumericKey,
-                SortDirection = SortDirections.Ascending,
-                CustomSortField = NumericKey1,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.Greater(search.Results[1].NumericKeys[NumericKey1], search.Results[0].NumericKeys[NumericKey1]);
-            Assert.Greater(search.Results[2].NumericKeys[NumericKey1], search.Results[1].NumericKeys[NumericKey1]);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_NumericKeys_Descending_Returns_Bigger_Numbers_First()
-        {
-            var added = this.AddDocumentsWithNumericKeys();
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "Title",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.NumericKey,
-                SortDirection = SortDirections.Descending,
-                CustomSortField = NumericKey1,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.Greater(search.Results[0].NumericKeys[NumericKey1], search.Results[1].NumericKeys[NumericKey1]);
-            Assert.Greater(search.Results[1].NumericKeys[NumericKey1], search.Results[2].NumericKeys[NumericKey1]);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Title_Ascending_Returns_Alphabetic_Ascending()
-        {
-            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
-
-            var added = this.AddDocuments(titles, "animal");
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "animal",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.Title,
-                SortDirection = SortDirections.Ascending,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-
-            var count = 0;
-            foreach (var title in titles.OrderBy(s => s))
-            {
-                Assert.AreEqual(title, search.Results[count++].Title);
-            }
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Title_Descending_Returns_Alphabetic_Descending()
-        {
-            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
-
-            var added = this.AddDocuments(titles, "animal");
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "animal",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.Title,
-                SortDirection = SortDirections.Descending,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-
-            var count = 0;
-            foreach (var title in titles.OrderByDescending(s => s))
-            {
-                Assert.AreEqual(title, search.Results[count++].Title);
-            }
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Keyword_Ascending_Returns_Alphabetic_Ascending()
-        {
-            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
-
-            var added = this.AddDocumentsWithKeywords(titles, "animal");
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "animal",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.Keyword,
-                SortDirection = SortDirections.Ascending,
-                CustomSortField = KeyWord1Name,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-
-            var count = 0;
-            foreach (var title in titles.OrderBy(s => s))
-            {
-                Assert.AreEqual(title, search.Results[count++].Keywords[KeyWord1Name]);
-            }
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Keyword_Descending_Returns_Alphabetic_Descending()
-        {
-            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
-
-            var added = this.AddDocumentsWithKeywords(titles, "animal");
-
-            // Act
-            var query = new SearchQuery
-            {
-                KeyWords = "animal",
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                SortField = SortFields.Keyword,
-                SortDirection = SortDirections.Descending,
-                CustomSortField = KeyWord1Name,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-
-            var count = 0;
-            foreach (var title in titles.OrderByDescending(s => s))
-            {
-                Assert.AreEqual(title, search.Results[count++].Keywords[KeyWord1Name]);
-            }
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sort_By_Unknown_StringField_In_Descending_Order_Does_Not_Throw()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomStringField,
-                SortDirection = SortDirections.Descending,
-                CustomSortField = "unknown",
-            };
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sort_By_Unknown_StringField_In_Ascending_Order_Does_Not_Throw()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomStringField,
-                SortDirection = SortDirections.Ascending,
-                CustomSortField = "unknown",
-            };
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sort_By_Unknown_NumericField_In_Descending_Order_Does_Not_Throw()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomNumericField,
-                SortDirection = SortDirections.Descending,
-                CustomSortField = "unknown",
-            };
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sort_By_Unknown_NumericField_In_Ascending_Order_Does_Not_Throw()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.CustomNumericField,
-                SortDirection = SortDirections.Ascending,
-                CustomSortField = "unknown",
-            };
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Relevance_Returns_TopHit_Docs_First()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                KeyWords = "brown OR fox",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Snippet.Contains("brown") && search.Results[0].Snippet.Contains("dog"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_RelevanceAndTitleKeyword_Returns_TopHit_Docs_First()
-        {
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
-
-            // Arrange
-            var added = this.AddSearchDocsForCustomBoost();
-            this.CreateNewLuceneControllerInstance(true);
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                KeyWords = "Hello",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello1"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_RelevanceAndSubjectKeyword_Returns_TopHit_Docs_First()
-        {
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
-            this.CreateNewLuceneControllerInstance(true);
-
-            // Arrange
-            var added = this.AddSearchDocsForCustomBoost();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                KeyWords = "Hello",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello2"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_RelevanceAndCommentKeyword_Returns_TopHit_Docs_First()
-        {
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
-            this.CreateNewLuceneControllerInstance(true);
-
-            // Arrange
-            var added = this.AddSearchDocsForCustomBoost();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                KeyWords = "Hello",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello3"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_RelevanceAndAuthorKeyword_Returns_TopHit_Docs_First()
-        {
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
-            this.CreateNewLuceneControllerInstance(true);
-
-            // Arrange
-            var added = this.AddSearchDocsForCustomBoost();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                KeyWords = "Hello",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello4"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_Sorty_By_Relevance_Ascending_Does_Not_Change_Sequence_Of_Results()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.Relevance,
-                SortDirection = SortDirections.Ascending,
-                KeyWords = "brown OR fox",
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(added, search.Results.Count);
-            Assert.AreEqual(true, search.Results[0].Snippet.Contains("brown") && search.Results[0].Snippet.Contains("dog"));
-        }
-
-        [Test]
-        public void SearchController_GetResult_By_Locale_Returns_Specific_And_Neutral_Locales()
-        {
-            // Arrange
-            this.AddStandardSearchDocs();
-
-            // Act
-            var query = new SearchQuery
-            {
-                SearchTypeIds = new List<int> { ModuleSearchTypeId },
-                SortField = SortFields.LastModified,
-                CultureCode = CultureItIt,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(2, search.Results.Count, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
-            Assert.AreEqual(Line3, search.Results[0].Title);
-            Assert.AreEqual(Line1, search.Results[1].Title);
-        }
-
-        [Test]
-        public void SearchController_EnsureOldDocument_Deleted_Upon_Second_Index_Content_With_Same_Key()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                };
-            const string docKey = "key1";
-
-            // Act
-
-            // Add first document
-            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            // Add second document with same key
-            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc2);
-
-            // run luceneQuery on common keyword between both the docs
-            var search = this.SearchForKeyword("fox");
-
-            // Assert - there should just be one entry - first one must have been removed.
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(docs[1], search.Results[0].Title);
-        }
-
-        [Test]
-        public void SearchController_Add_Does_Not_Throw_On_Empty_Url()
-        {
-            var doc = new SearchDocument
-            {
-                UniqueKey = Guid.NewGuid().ToString(),
-                SearchTypeId = OtherSearchTypeId,
-                Title = " ",
-                ModifiedTimeUtc = DateTime.UtcNow,
-                QueryString = "?foo=bar",
-            };
-
-            Assert.DoesNotThrow(() => this._internalSearchController.AddSearchDocument(doc));
-        }
-
-        [Test]
-        public void SearchController_Add_Does_Not_Throw_On_Empty_Title()
-        {
-            var doc = new SearchDocument
-            {
-                UniqueKey = Guid.NewGuid().ToString(),
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-            };
-
-            Assert.DoesNotThrow(() => this._internalSearchController.AddSearchDocument(doc));
-        }
-
-        [Test]
-        public void SearchController_EnsureOldDocument_Deleted_Upon_Second_Index_When_IsActive_Is_False()
-        {
-            // Arrange
-            string[] docs =
-            {
-                Line1,
-                Line2,
-                };
-            const string docKey = "key1";
-
-            // Act
-
-            // Add first document
-            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            // Add second document with same key
-            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, IsActive = false };
-            this._internalSearchController.AddSearchDocument(doc2);
-
-            // run luceneQuery on common keyword between both the docs
-            var search = this.SearchForKeyword("fox");
-
-            // Assert - there should not be any record.
-            Assert.AreEqual(0, search.Results.Count);
-        }
-
-        // Note: these tests needs to pass through the analyzer which is utilized
-        //       in SearchControllerImpl but not LuceneControllerImpl.
-        [Test]
-        public void SearchController_SearchFindsAccentedAndNonAccentedWords()
-        {
-            // Arrange
-            string[] lines =
-            {
-                "zèbre or panthère",
-                "zebre without accent",
-                "panthere without accent",
-                };
-
-            this.AddLinesAsSearchDocs(lines);
-
-            // Act
-            var searches1 = this.SearchForKeyword("zèbre");
-            var searches2 = this.SearchForKeyword("zebre");
-
-            // Assert
-            Assert.AreEqual(2, searches1.TotalHits);
-            Assert.AreEqual("<b>z&#232;bre</b> or panth&#232;re", this.StipEllipses(searches1.Results[0].Snippet).Trim());
-            Assert.AreEqual("<b>zebre</b> without accent", this.StipEllipses(searches1.Results[1].Snippet).Trim());
-
-            Assert.AreEqual(2, searches2.TotalHits);
-            Assert.AreEqual("<b>z&#232;bre</b> or panth&#232;re", this.StipEllipses(searches2.Results[0].Snippet).Trim());
-            Assert.AreEqual("<b>zebre</b> without accent", this.StipEllipses(searches2.Results[1].Snippet).Trim());
-        }
-
-        [Test]
-        public void SearchController_PorterFilterTest()
-        {
-            // Arrange
-            string[] lines =
-            {
-                "field1_value",
-                "field2_value",
-                };
-
-            this.AddLinesAsSearchDocs(lines);
-
-            // Act
-            var search1 = this.SearchForKeyword(lines[0]);
-            var search2 = this.SearchForKeyword("\"" + lines[1] + "\"");
-
-            // Assert
-            Assert.AreEqual(1, search1.TotalHits);
-            Assert.AreEqual(1, search2.TotalHits);
-
-            Assert.AreEqual("<b>" + lines[0] + "</b>", this.StipEllipses(search1.Results[0].Snippet).Trim());
-            Assert.AreEqual("<b>" + lines[1] + "</b>", this.StipEllipses(search2.Results[0].Snippet).Trim());
-        }
-
-        [Test]
-        public void SearchController_SearchFindsStemmedWords()
-        {
-            // Arrange
-            string[] lines =
-            {
-                "I ride my bike to work",
-                "All team are riding their bikes",
-                "The boy rides his bike to school",
-                "This sentence is missing the bike ri... word",
-                };
-
-            this.AddLinesAsSearchDocs(lines);
-
-            // Act
-            var search = this.SearchForKeyword("ride");
-
-            // Assert
-            Assert.AreEqual(3, search.TotalHits);
-            Assert.AreEqual("I <b>ride</b> my bike to work", this.StipEllipses(search.Results[0].Snippet));
-            Assert.AreEqual("m are <b>riding</b> their bikes", this.StipEllipses(search.Results[1].Snippet));
-            Assert.AreEqual("e boy <b>rides</b> his bike to school", this.StipEllipses(search.Results[2].Snippet));
-        }
-
-        [Test]
-        public void SearchController_Search_Synonym_Works()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-
-            // Act
-            var search = this.SearchForKeywordInModule("wolf");
-
-            // Assert
-            Assert.AreEqual(added, search.TotalHits);
-
-            var snippets = search.Results.Select(result => this.StipEllipses(result.Snippet)).OrderBy(s => s).ToArray();
-            Assert.AreEqual("brown <b>fox</b> jumps over the lazy dog", snippets[0]);
-            Assert.AreEqual("e red <b>fox</b> jumped over the lazy dark gray dog", snippets[1]);
-            Assert.AreEqual("gold <b>fox</b> jumped over the lazy black dog", snippets[2]);
-            Assert.AreEqual("quick <b>fox</b> jumps over the black dog - Italian", snippets[3]);
-        }
-
-        [Test]
-        public void SearchController_Title_Ranked_Higher_Than_Body()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "Hello World" };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "cow is gone" };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("cow");
-
-            // Assert
-            Assert.AreEqual(result.TotalHits, 2);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Title_Ranked_Higher_Than_Body_Regardless_Of_Document_Sequence()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "cow is gone" };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("cow");
-
-            // Assert
-            Assert.AreEqual(result.TotalHits, 2);
-            Assert.AreEqual(doc3.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[1].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Title_Ranked_Higher_Than_Tag()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "Hello World" };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { "cow", "hello", "world" } };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-            var result = this.SearchForKeyword("cow");
-
-            // Assert
-            Assert.AreEqual(result.TotalHits, 2);
-            Console.WriteLine("first score: {0}  {1}", result.Results[0].UniqueKey, result.Results[0].DisplayScore);
-            Console.WriteLine("second score: {0}  {1}", result.Results[1].UniqueKey, result.Results[1].DisplayScore);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_RankingTest_With_Vowel()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "tootsie", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { "tootsie" } };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Keywords = new Dictionary<string, string>() { { KeyWord1Name, "tootsie" } } };
-            var doc4 = new SearchDocument { UniqueKey = "key04", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Description = "tootsie" };
-            var doc5 = new SearchDocument { UniqueKey = "key05", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "hello tootsie" };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-            this._internalSearchController.AddSearchDocument(doc5);
-
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("tootsie");
-
-            // Assert
-            Assert.AreEqual(5, result.TotalHits);
-            foreach (var searchResult in result.Results)
-            {
-                Console.WriteLine("{0} score: {1}", searchResult.UniqueKey, searchResult.DisplayScore);
-            }
-
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
-            Assert.AreEqual(doc4.UniqueKey, result.Results[3].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_FileNameTest_With_WildCard()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeywordWithWildCard("file");
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Full_FileNameTest_Without_WildCard()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeywordWithWildCard("file.ext");
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Full_FileNameTest_With_WildCard()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("file.ext");
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Scope_By_FolderName()
-        {
-            // Arrange
-            this.AddFoldersAndFiles();
-
-            // Act
-            var result1 = this.SearchForKeyword("kw-folderName:Images/*");
-            var result2 = this.SearchForKeyword("kw-folderName:Images/DNN/*");
-            var result3 = this.SearchForKeywordWithWildCard("kw-folderName:Images/* AND spacer");
-
-            // Assert
-            Assert.AreEqual(5, result1.TotalHits);
-            Assert.AreEqual(2, result2.TotalHits);
-            Assert.AreEqual(1, result3.TotalHits);
-        }
-
-        [Test]
-        public void SearchController_Scope_By_FolderName_With_Spaces()
-        {
-            // Arrange
-            this.AddFoldersAndFiles();
-
-            // Act - Space is replaced by <
-            var query1 = new SearchQuery { KeyWords = "kw-folderName:Images/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = false };
-            var query2 = new SearchQuery { KeyWords = "kw-folderName:my<Images/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = true };
-            var query3 = new SearchQuery { KeyWords = "kw-folderName:my<Images/my<dnn/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = true };
-            var result1 = this._searchController.SiteSearch(query1);
-            var result2 = this._searchController.SiteSearch(query2);
-            var result3 = this._searchController.SiteSearch(query3);
-
-            // Assert
-            Assert.AreEqual(5, result1.TotalHits);
-            Assert.AreEqual(5, result2.TotalHits);
-            Assert.AreEqual(2, result3.TotalHits);
-        }
-
-        [Test]
-        public void SearchController_EmailTest_With_WildCard()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "email@domain.com", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeywordWithWildCard("email@");
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Add_Use_Of_Module_Search_Type_Requires_ModuleDefinitionId()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Add_Use_Of_Module_Search_Type_Requires_ModuleId()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Add_Non_Module_Type_SearchId_Should_Not_Provide_ModuleDefinitionId()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Add_Non_Module_Type_SearchId_Should_Not_Provide_ModuleId()
-        {
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleId = HtmlModuleId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Search_For_ModuleId_Must_Have_Only_One_Search_Type_Id_Specified()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { DocumentSearchTypeId, OtherSearchTypeId }, ModuleId = IdeasModuleId };
-
-            // Act
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void SearchController_Search_For_ModuleId_Must_Have_Only_Module_Search_Type_Id_Specified()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, OtherSearchTypeId }, ModuleId = IdeasModuleId };
-
-            // Act
-            this._searchController.SiteSearch(query);
-        }
-
-        [Test]
-        public void SearchController_Search_For_Unknown_SearchTypeId_Does_Not_Throw_Exception()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = UnknownSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-            this._internalSearchController.AddSearchDocument(doc1);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { UnknownSearchTypeId } };
-
-            // Act
-            var result = this._searchController.SiteSearch(query);
-            Assert.AreEqual(0, result.TotalHits); // 0 due to security trimming
-            Assert.AreEqual(0, result.Results.Count);
-        }
-
-        [Test]
-        public void SearchController_Search_For_GroupId_Zero_Ignores_GroupId()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId0 };
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, RoleId = 0 };
-
-            // Act
-            var result = this._searchController.SiteSearch(query);
-            Assert.AreEqual(2, result.TotalHits);
-        }
-
-        [Test]
-        public void SearchController_Search_For_GroupId_Returns_Records_With_GroupIds_Only()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId532 };
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, RoleId = RoleId731 };
-
-            // Act
-            var result = this._searchController.SiteSearch(query);
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(RoleId731, result.Results[0].RoleId);
-        }
-
-        [Test]
-        public void SearchController_Search_For_GroupId_Returns_Records_With_GroupIds_Only_Even_In_Multi_SearchTypeId()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId532 };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId, ModuleSearchTypeId }, RoleId = RoleId731 };
-
-            // Act
-            var result = this._searchController.SiteSearch(query);
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(RoleId731, result.Results[0].RoleId);
-        }
-
-        [Test]
-        public void SearchController_Search_For_Two_ModuleDefinitions_Returns_Two_Only()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
-
-            var result = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(2, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Search_For_ModuleId_Returns_from_that_module_Only()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId }, ModuleId = IdeasModuleId };
-
-            var result = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(2, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Search_For_Module_Search_Type_And_Multiple_ModuleDefIds_Should_Return_From_Those_ModuleDefinitions_Only()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
-
-            var result = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(3, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Search_For_Multiple_Search_Types_Should_Return_Result_from_All_Sources()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
-            var doc5 = new SearchDocument { UniqueKey = "key05", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-            this._internalSearchController.AddSearchDocument(doc5);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, OtherSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
-
-            var result = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(4, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
-            Assert.AreEqual(doc5.UniqueKey, result.Results[3].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Search_For_ModuleSearchTypeId_With_Two_ModuleDefinitions_And_OtherSearchTypeId_Returns_Correct_Results()
-        {
-            // Arrange
-            const string keyword = "awesome";
-
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId, ModuleId = HtmlModuleId };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId, ModuleId = HtmlModuleId };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
-            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
-            var doc5 = new SearchDocument { UniqueKey = "key05", Title = keyword, SearchTypeId = TabSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-            this._internalSearchController.AddSearchDocument(doc5);
-
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, TabSearchTypeId }, ModuleDefIds = new[] { HtmlModuleDefId } };
-
-            var result = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(3, result.TotalHits);
-            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
-            Assert.AreEqual(doc5.UniqueKey, result.Results[2].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Works_With_Custom_Numeric_Querirs()
-        {
-            this.AddDocumentsWithNumericKeys();
-
-            // Act
-            var query = new SearchQuery
-            {
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue50 } },
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                WildCardSearch = false,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(NumericValue50, search.Results[0].NumericKeys[NumericKey1]);
-        }
-
-        [Test]
-        public void SearchController_GetResult_Works_With_CustomKeyword_Querirs()
-        {
-            this.AddDocumentsWithKeywords();
-
-            // Act
-            var query = new SearchQuery
-            {
-                CustomKeywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value } },
-                SearchTypeIds = new List<int> { OtherSearchTypeId },
-                WildCardSearch = false,
-            };
-            var search = this._searchController.SiteSearch(query);
-
-            // Assert
-            Assert.AreEqual(1, search.Results.Count);
-            Assert.AreEqual(KeyWord1Value, search.Results[0].Keywords[KeyWord1Name]);
-        }
-
-        [Test]
-        public void SearchController_EnableLeadingWildcard_Should_Not_Return_Results_When_Property_Is_False()
-        {
-            this._mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("N");
-
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, false);
-
-            // Assert
-            Assert.AreEqual(0, result.TotalHits);
-        }
-
-        [Test]
-        public void SearchController_EnableLeadingWildcard_Should_Return_Results_When_Property_Is_True()
-        {
-            this._mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("N");
-
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, true);
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_EnableLeadingWildcard_Should_Return_Results_When_Property_Is_False_But_Host_Setting_Is_True()
-        {
-            this._mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("Y");
-
-            // Arrange
-            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
-
-            // Act
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.Commit();
-
-            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, false);
-
-            // Assert
-            Assert.AreEqual(1, result.TotalHits);
-            Assert.AreEqual(doc2.UniqueKey, result.Results[0].UniqueKey);
-        }
-
-        [Test]
-        public void SearchController_Search_StopWords_Works()
-        {
-            // Arrange
-            var added = this.AddStandardSearchDocs();
-            this._internalSearchController.Commit();
-
-            // Act
-            var search = this.SearchForKeywordInModule("the");
-
-            // Assert
-            // the word "the" is ignored in all languages except es-ES
-            Assert.AreEqual(1, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
-
-            // Act
-            search = this.SearchForKeywordInModule("over");
-
-            // Assert
-            // we won't find "over" in neutral, en-US, and en-CA documents, but will find it in the es-ES and it-IT documents.
-            Assert.AreEqual(2, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
-
-            // Act
-            search = this.SearchForKeywordInModule("los");
-
-            // Assert
-            // we won't find "los" in the es-ES document.
-            Assert.AreEqual(0, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
-        }
-
-        /// <summary>
-        /// Executes function proc on a separate thread respecting the given timeout value.
-        /// </summary>
-        /// <typeparam name="R"></typeparam>
-        /// <param name="proc">The function to execute.</param>
-        /// <param name="timeout">The timeout duration.</param>
-        /// <returns>R.</returns>
-        /// <remarks>From: http://stackoverflow.com/questions/9460661/implementing-regex-timeout-in-net-4.</remarks>
-        private static R ExecuteWithTimeout<R>(Func<R> proc, TimeSpan timeout)
-        {
-            var r = default(R); // init default return value
-            Exception ex = null; // records inter-thread exception
-
-            // define a thread to wrap 'proc'
-            var t = new Thread(() =>
-            {
-                try
-                {
-                    r = proc();
-                }
-                catch (Exception e)
-                {
-                    // this can get set to ThreadAbortException
-                    ex = e;
-
-                    Console.WriteLine("Exception hit");
-                }
-            });
-
-            t.Start(); // start running 'proc' thread wrapper
-
-            // from docs: "The Start method does not return until the new thread has started running."
-            if (t.Join(timeout) == false)
-            {
-                t.Abort(); // die evil thread!
-
-                // Abort raises the ThreadAbortException
-                int i = 0;
-                while ((t.Join(1) == false) && (i < 20))
-                {
-                    // 20 ms wait possible here
-                    i++;
-                }
-
-                if (i >= 20)
-                {
-                    // we didn't abort, might want to log this or take some other action
-                    // this can happen if you are doing something indefinitely hinky in a
-                    // finally block (cause the finally be will executed before the Abort
-                    // completes.
-                    Console.WriteLine("Abort didn't work as expected");
-                }
-            }
-
-            if (ex != null)
-            {
-                throw ex; // oops
-            }
-
-            return r; // ah!
-        }
-
-        private void CreateNewLuceneControllerInstance(bool reCreate = false)
-        {
-            InternalSearchController.SetTestableInstance(new InternalSearchControllerImpl());
-            this._internalSearchController = InternalSearchController.Instance;
-            this._searchController = new SearchControllerImpl();
-
-            if (!reCreate)
-            {
-                this.DeleteIndexFolder();
-
-                if (this._luceneController != null)
-                {
-                    LuceneController.ClearInstance();
-                    this._luceneController.Dispose();
-                }
-
-                this._luceneController = new LuceneControllerImpl();
-                LuceneController.SetTestableInstance(this._luceneController);
-            }
-        }
-
-        private void SetupHostController()
-        {
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
-            this._mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this._readerStaleTimeSpan);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTitleBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTagBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchKeywordBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchDescriptionBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchAuthorBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(DefaultSearchRetryTimes);
-            HostController.RegisterInstance(this._mockHostController.Object);
-        }
-
-        private void SetupLocaleController()
-        {
-            this._mockLocaleController.Setup(l => l.GetLocale(It.IsAny<string>())).Returns(new Locale { LanguageId = -1, Code = string.Empty });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEnCa)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
-            this._mockLocaleController.Setup(l => l.GetLocale(CultureEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
-
-            this._mockLocaleController.Setup(l => l.GetLocale(It.IsAny<int>())).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnFr)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
-            this._mockLocaleController.Setup(l => l.GetLocale(LanguageIdEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
-        }
-
-        private void SetupDataProvider()
-        {
-            // Standard DataProvider Path for Logging
-            this._mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-
-            DataTableReader searchTypes = null;
-            this._mockDataProvider.Setup(ds => ds.GetAllSearchTypes())
-                     .Callback(() => searchTypes = this.GetAllSearchTypes().CreateDataReader())
-                     .Returns(() => searchTypes);
-
-            this._mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
-        }
-
-        private IDataReader GetPortalsCallBack(string culture)
-        {
-            return this.GetPortalCallBack(PortalId0, CultureEnUs);
-        }
-
-        private IDataReader GetPortalCallBack(int portalId, string culture)
-        {
-            var table = new DataTable("Portal");
-
-            var cols = new[]
-                        {
-                            "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
-                            "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
-                            "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
-                            "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            const int homePage = 1;
-            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null,
-                    "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null,
-                    "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0",
-                    null, homePage.ToString("D"), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
-
-            return table.CreateDataReader();
-        }
-
-        private void SetupSearchHelper()
-        {
-            this._mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
-            this._mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>())).Returns<int, string, string>(this.GetSynonymsCallBack);
-            this._mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns((string name) => new SearchType { SearchTypeId = 0, SearchTypeName = name });
-            this._mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(this.GetSearchTypeByNameCallback);
-            this._mockSearchHelper.Setup(x => x.GetSearchTypes()).Returns(this.GetSearchTypes());
-            this._mockSearchHelper.Setup(x => x.GetSearchStopWords(It.IsAny<int>(), It.IsAny<string>())).Returns(new SearchStopWords());
-            this._mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEsEs)).Returns(
-                new SearchStopWords
-                {
-                    PortalId = 0,
-                    CultureCode = CultureEsEs,
-                    StopWords = "los,de,el",
-                });
-            this._mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEnUs)).Returns(
-                new SearchStopWords
-                {
-                    PortalId = 0,
-                    CultureCode = CultureEnUs,
-                    StopWords = "the,over",
-                });
-            this._mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEnCa)).Returns(
-                new SearchStopWords
-                {
-                    PortalId = 0,
-                    CultureCode = CultureEnCa,
-                    StopWords = "the,over",
-                });
-
-            this._mockSearchHelper.Setup(x => x.RephraseSearchText(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns<string, bool, bool>(new SearchHelperImpl().RephraseSearchText);
-            this._mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
-            SearchHelper.SetTestableInstance(this._mockSearchHelper.Object);
-        }
-
-        private SearchType GetSearchTypeByNameCallback(string searchTypeName)
-        {
-            var searchType = new SearchType { SearchTypeName = searchTypeName, SearchTypeId = 0 };
-            switch (searchTypeName)
-            {
-                case ModuleSearchTypeName:
-                    searchType.SearchTypeId = ModuleSearchTypeId;
-                    break;
-                case TabSearchTypeName:
-                    searchType.SearchTypeId = TabSearchTypeId;
-                    break;
-                case OtherSearchTypeName:
-                    searchType.SearchTypeId = OtherSearchTypeId;
-                    break;
-                case DocumentSearchTypeName:
-                    searchType.SearchTypeId = DocumentSearchTypeId;
-                    break;
-                case UrlSearchTypeName:
-                    searchType.SearchTypeId = UrlSearchTypeId;
-                    break;
-            }
-
-            return searchType;
-        }
-
-        private IList<string> GetSynonymsCallBack(int portalId, string cultureCode, string term)
-        {
-            var synonyms = new List<string>();
-            if (term == "fox")
-            {
-                synonyms.Add("wolf");
-            }
-
-            return synonyms;
-        }
-
-        private UserInfo GetUserByIdCallback(int portalId, int userId)
-        {
-            if (portalId == PortalId12 && userId == StandardAuthorId)
-            {
-                return new UserInfo { UserID = userId, DisplayName = StandardAuthorDisplayName };
-            }
-
-            return null;
-        }
-
-        private DataTable GetAllSearchTypes()
-        {
-            var dtSearchTypes = new DataTable("SearchTypes");
-            var pkId = dtSearchTypes.Columns.Add("SearchTypeId", typeof(int));
-            dtSearchTypes.Columns.Add("SearchTypeName", typeof(string));
-            dtSearchTypes.Columns.Add("SearchResultClass", typeof(string));
-            dtSearchTypes.PrimaryKey = new[] { pkId };
-
-            // Create default Crawler
-            dtSearchTypes.Rows.Add(ModuleSearchTypeId, ModuleSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(TabSearchTypeId, TabSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(OtherSearchTypeId, OtherSearchTypeName, FakeResultControllerClass);
-            dtSearchTypes.Rows.Add(DocumentSearchTypeId, DocumentSearchTypeName, NoPermissionFakeResultControllerClass);
-            dtSearchTypes.Rows.Add(UrlSearchTypeId, UrlSearchTypeName, FakeResultControllerClass);
-
-            return dtSearchTypes;
-        }
-
-        private IEnumerable<SearchType> GetSearchTypes()
-        {
-            var searchTypes = new List<SearchType>
-                {
-                    new SearchType { SearchTypeId = ModuleSearchTypeId, SearchTypeName = ModuleSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                    new SearchType { SearchTypeId = TabSearchTypeId, SearchTypeName = TabSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                    new SearchType { SearchTypeId = OtherSearchTypeId, SearchTypeName = OtherSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                    new SearchType { SearchTypeId = DocumentSearchTypeId, SearchTypeName = DocumentSearchTypeName, SearchResultClass = NoPermissionFakeResultControllerClass },
-                    new SearchType { SearchTypeId = UrlSearchTypeId, SearchTypeName = UrlSearchTypeName, SearchResultClass = FakeResultControllerClass },
-                };
-
-            return searchTypes;
-        }
-
-        private void DeleteIndexFolder()
-        {
-            try
-            {
-                if (Directory.Exists(SearchIndexFolder))
-                {
-                    Directory.Delete(SearchIndexFolder, true);
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex);
-            }
-        }
-
-        /// <summary>
-        /// Returns few SearchDocs.
-        /// </summary>
-        private IEnumerable<SearchDocument> GetStandardSearchDocs(int searchTypeId = ModuleSearchTypeId)
-        {
-            var searchDocs = new List<SearchDocument>
-            {
-                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag0, Tag1, TagOldest, Tag0WithSpace }, Title = Line1 },
-                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag1, Tag2, TagNeutral }, Title = Line2, CultureCode = CultureEnUs },
-                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag2, Tag3, TagIt }, Title = Line3, CultureCode = CultureItIt },
-                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag3, Tag4, TagLatest }, Title = Line4, CultureCode = CultureEnCa },
-                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag2, Tag3, TagIt }, Title = Line5, CultureCode = CultureEsEs },
-            };
-
-            var now = DateTime.UtcNow.AddYears(-searchDocs.Count);
-            var i = 0;
-
-            foreach (var searchDocument in searchDocs)
-            {
-                searchDocument.SearchTypeId = searchTypeId;
-                searchDocument.UniqueKey = Guid.NewGuid().ToString();
-                searchDocument.ModuleId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleId : -1;
-                searchDocument.ModuleDefId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleDefId : -1;
-                searchDocument.ModifiedTimeUtc = now.AddYears(++i); // last added is the newest
-            }
-
-            return searchDocs;
-        }
-
-        private IEnumerable<SearchDocument> GetSearchDocsForCustomBoost(int searchTypeId = ModuleSearchTypeId)
-        {
-            var searchDocs = new List<SearchDocument>
-            {
-                new SearchDocument { PortalId = PortalId0, Title = Line1, Keywords = { { "title", "Hello" } }, Body = "Hello1 World" },
-                new SearchDocument { PortalId = PortalId0, Title = Line2, Keywords = { { "subject", "Hello" } }, Body = "Hello2 World" },
-                new SearchDocument { PortalId = PortalId0, Title = Line3, Keywords = { { "comments", "Hello" } }, Body = "Hello3 World" },
-                new SearchDocument { PortalId = PortalId0, Title = Line4, Keywords = { { "authorname", "Hello" } }, Body = "Hello4 World" },
-            };
-
-            var now = DateTime.UtcNow.AddYears(-searchDocs.Count);
-            var i = 0;
-
-            foreach (var searchDocument in searchDocs)
-            {
-                searchDocument.SearchTypeId = searchTypeId;
-                searchDocument.UniqueKey = Guid.NewGuid().ToString();
-                searchDocument.ModuleId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleId : -1;
-                searchDocument.ModuleDefId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleDefId : -1;
-                searchDocument.ModifiedTimeUtc = now.AddYears(++i); // last added is the newest
-            }
-
-            return searchDocs;
-        }
-
-        /// <summary>
-        /// Adds standarad SearchDocs in Lucene Index.
-        /// </summary>
-        /// <returns>Number of dcuments added.</returns>
-        private int AddStandardSearchDocs(int searchTypeId = ModuleSearchTypeId)
-        {
-            var docs = this.GetStandardSearchDocs(searchTypeId).ToArray();
-            this._internalSearchController.AddSearchDocuments(docs);
-            return docs.Length;
-        }
-
-        private int AddSearchDocsForCustomBoost(int searchTypeId = ModuleSearchTypeId)
-        {
-            var docs = this.GetSearchDocsForCustomBoost(searchTypeId).ToArray();
-            this._internalSearchController.AddSearchDocuments(docs);
-            return docs.Length;
-        }
-
-        private int AddDocumentsWithNumericKeys(int searchTypeId = OtherSearchTypeId)
-        {
-            var doc1 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key1",
-                Body = "hello",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue50 } },
-            };
-            var doc2 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key2",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue100 } },
-            };
-            var doc3 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key3",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue200 } },
-            };
-            var doc4 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key4",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue500 } },
-            };
-            var doc5 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key5",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue1000 } },
-            };
-
-            var docs = new List<SearchDocument>() { doc1, doc2, doc3, doc4, doc5 };
-
-            this._internalSearchController.AddSearchDocuments(docs);
-
-            return docs.Count;
-        }
-
-        private int AddDocumentsWithKeywords(int searchTypeId = OtherSearchTypeId)
-        {
-            var doc1 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key1",
-                Body = "hello",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value } },
-            };
-            var doc2 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key2",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord2Value } },
-            };
-            var doc3 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key3",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord3Value } },
-            };
-            var doc4 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key4",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord4Value } },
-            };
-            var doc5 = new SearchDocument
-            {
-                Title = "Title",
-                UniqueKey = "key5",
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord5Value } },
-            };
-
-            var docs = new List<SearchDocument>() { doc1, doc2, doc3, doc4, doc5 };
-
-            this._internalSearchController.AddSearchDocuments(docs);
-
-            return docs.Count;
-        }
-
-        private int AddDocuments(IList<string> titles, string body, int searchTypeId = OtherSearchTypeId)
-        {
-            var count = 0;
-            foreach (var doc in titles.Select(title => new SearchDocument
-            {
-                Title = title,
-                UniqueKey = Guid.NewGuid().ToString(),
-                Body = body,
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-            }))
-            {
-                this._internalSearchController.AddSearchDocument(doc);
-                count++;
-            }
-
-            return count;
-        }
-
-        private int AddDocumentsWithKeywords(IEnumerable<string> keywords, string title, int searchTypeId = OtherSearchTypeId)
-        {
-            var count = 0;
-            foreach (var doc in keywords.Select(keyword => new SearchDocument
-            {
-                Title = title,
-                UniqueKey = Guid.NewGuid().ToString(),
-                Keywords = new Dictionary<string, string>() { { KeyWord1Name, keyword } },
-                SearchTypeId = OtherSearchTypeId,
-                ModifiedTimeUtc = DateTime.UtcNow,
-                PortalId = PortalId12,
-            }))
-            {
-                this._internalSearchController.AddSearchDocument(doc);
-                count++;
-            }
-
-            return count;
-        }
-
-        private void AddLinesAsSearchDocs(IList<string> lines, int searchTypeId = OtherSearchTypeId)
-        {
-            var now = DateTime.UtcNow - TimeSpan.FromSeconds(lines.Count());
-            var i = 0;
-
-            this._internalSearchController.AddSearchDocuments(
-                lines.Select(line =>
-                    new SearchDocument
-                    {
-                        Title = line,
-                        UniqueKey = Guid.NewGuid().ToString(),
-                        SearchTypeId = searchTypeId,
-                        ModifiedTimeUtc = now.AddSeconds(i++),
-                    }).ToList());
-        }
-
-        private SearchResults SearchForKeyword(string keyword, int searchTypeId = OtherSearchTypeId, bool useWildcard = false, bool allowLeadingWildcard = false)
-        {
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId }, WildCardSearch = useWildcard, AllowLeadingWildcard = allowLeadingWildcard };
-            return this._searchController.SiteSearch(query);
-        }
-
-        private SearchResults SearchForKeywordWithWildCard(string keyword, int searchTypeId = OtherSearchTypeId)
-        {
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId }, WildCardSearch = true };
-            return this._searchController.SiteSearch(query);
-        }
-
-        private SearchResults SearchForKeywordInModule(string keyword, int searchTypeId = ModuleSearchTypeId)
-        {
-            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId } };
-            return this._searchController.SiteSearch(query);
-        }
-
-        private string StipEllipses(string text)
-        {
-            return text.Replace("...", string.Empty).Trim();
-        }
-
-        /// <summary>
-        /// Sets up some data for testing security trimming.
-        /// In the tests below, the users will have access to the follwoing documents
-        /// { 6, 7, 8, 9, 16, 17, 18, 19, 26, 27, 28, 29, ..., etc. }
-        /// The tests check that pagination qith various page sizes returns the proper groupings.
-        /// </summary>
-        private void SetupSecurityTrimmingDocs(int totalDocs, int searchType = DocumentSearchTypeId)
-        {
-            var docModifyTime = DateTime.UtcNow - TimeSpan.FromSeconds(totalDocs);
-            for (var i = 0; i < totalDocs; i++)
-            {
-                this._internalSearchController.AddSearchDocument(new SearchDocument
-                {
-                    AuthorUserId = i,
-                    Title = "Fox and Dog",
-                    Body = Line1,
-                    Tags = new[] { Tag0, Tag1 },
-                    SearchTypeId = searchType,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    ModifiedTimeUtc = docModifyTime.AddSeconds(i),
-                });
-            }
-        }
-
-        private void AddFoldersAndFiles()
-        {
-            var allFiles = new Dictionary<string, string>
-                               {
-                                { "Awesome-Cycles-Logo.png", "Images/" },
-                                { "Banner1.jpg", "Images/" },
-                                { "Banner2.jpg", "Images/" },
-                                { "bike-powered.png", "Images/DNN/" },
-                                { "Spacer.gif", "Images/DNN/" },
-                                { "monday.png", "My<Images/" },
-                                { "tuesday.jpg", "My<Images/" },
-                                { "wednesday.jpg", "My<Images/" },
-                                { "thursday.png", "My<Images/My<DNN/" },
-                                { "friday.gif", "My<Images/My<DNN/" },
-                               };
-
-            foreach (var file in allFiles)
-            {
-                var doc = new SearchDocument
-                {
-                    Title = file.Key,
-                    UniqueKey = Guid.NewGuid().ToString(),
-                    SearchTypeId = OtherSearchTypeId,
-                    ModifiedTimeUtc = DateTime.UtcNow,
-                    Keywords = new Dictionary<string, string> { { "folderName", file.Value.ToLowerInvariant() } },
-                };
-                this._internalSearchController.AddSearchDocument(doc);
-            }
-
-            this._internalSearchController.Commit();
-        }
-    }
-}
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using Constants = DotNetNuke.Services.Search.Internals.Constants;
+
+    /// <summary>
+    ///  Testing various aspects of SearchController.
+    /// </summary>
+    [TestFixture]
+    public class SearchControllerTests
+    {
+        private const int ModuleSearchTypeId = (int)SearchTypeIds.ModuleSearchTypeId;
+        private const int TabSearchTypeId = (int)SearchTypeIds.TabSearchTypeId;
+        private const int DocumentSearchTypeId = (int)SearchTypeIds.DocumentSearchTypeId;
+        private const int UrlSearchTypeId = (int)SearchTypeIds.UrlSearchTypeId;
+        private const int OtherSearchTypeId = (int)SearchTypeIds.OtherSearchTypeId;
+        private const int UnknownSearchTypeId = (int)SearchTypeIds.UnknownSearchTypeId;
+        private const int PortalId0 = 0;
+        private const int PortalId12 = 12;
+        private const int IdeasModuleDefId = 201;
+        private const int BlogsoduleDefId = 202;
+        private const int AnswersModuleDefId = 203;
+        private const int HtmlModuleDefId = 20;
+        private const int HtmlModuleId = 25;
+        private const int IdeasModuleId = 301;
+        private const int BlogsModuleId = 302;
+        private const int AnswersModuleId = 303;
+        private const int RoleId731 = 731;
+        private const int RoleId532 = 532;
+        private const int RoleId0 = 0;
+        private const string Tag0 = "tag0";
+        private const string Tag0WithSpace = "tag0 hello";
+        private const string Tag1 = "tag1";
+        private const string Tag2 = "tag2";
+        private const string Tag3 = "tag3";
+        private const string Tag4 = "tag4";
+        private const string TagTootsie = "tootsie";
+        private const string TagLatest = "latest";
+        private const string TagOldest = "oldest";
+        private const string TagIt = "IT";
+        private const string TagNeutral = "Neutral";
+        private const string ModuleSearchTypeName = "module";
+        private const string OtherSearchTypeName = "other";
+        private const string TabSearchTypeName = "tab";
+        private const string DocumentSearchTypeName = "document";
+        private const string UrlSearchTypeName = "url";
+        private const string ModuleResultControllerClass = "DotNetNuke.Services.Search.Crawlers.ModuleResultController, DotNetNuke";
+        private const string FakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.FakeResultController, DotNetNuke.Tests.Core";
+        private const string NoPermissionFakeResultControllerClass = "DotNetNuke.Tests.Core.Controllers.Search.NoPermissionFakeResultController, DotNetNuke.Tests.Core";
+        private const string CultureEnUs = "en-US";
+        private const string CultureEnCa = "en-CA";
+        private const string CultureItIt = "it-IT";
+        private const string CultureEsEs = "es-ES";
+        private const int LanguageIdEnUs = 1;
+        private const int LanguageIdEnFr = 2;
+        private const int LanguageIdItIt = 3;
+        private const int LanguageIdEsEs = 4;
+        private const int StandardAuthorId = 55;
+        private const int StandardRoleId = 66;
+        private const string StandardAuthorDisplayName = "Standard User";
+        private const int StandardTabId = 99;
+        private const string StandardPermission = "!Translator (en-US);![4];[5];[6];Administrators;ContentEditorRole;";
+        private const string StandardQueryString = "cid=1";
+        private const string NumericKey1 = "numerickey1";
+        private const string NumericKey2 = "numerickey2";
+        private const int NumericValue1 = 77777;
+        private const int NumericValue2 = 55555;
+        private const int NumericValue50 = 50;
+        private const int NumericValue100 = 100;
+        private const int NumericValue200 = 200;
+        private const int NumericValue500 = 500;
+        private const int NumericValue1000 = 1000;
+        private const string KeyWord1Name = "keyword1";
+        private const string KeyWord1Value = "value1";
+        private const string KeyWord2Name = "keyword2";
+        private const string KeyWord2Value = "value2";
+        private const string KeyWord3Value = "value3";
+        private const string KeyWord4Value = "value4";
+        private const string KeyWord5Value = "value5";
+        private const string Line1 = "The quick brown fox jumps over the lazy dog";
+        private const string Line2 = "The quick gold fox jumped over the lazy black dog";
+        private const string Line3 = "the quick fox jumps over the black dog - Italian";
+        private const string Line4 = "the red fox jumped over the lazy dark gray dog";
+        private const string Line5 = "the quick fox jumps over the white dog - los de el Espana";
+
+        private const int CustomBoost = 80;
+
+        private const string SearchIndexFolder = @"App_Data\SearchTests";
+        private const int DefaultSearchRetryTimes = 5;
+        private readonly double readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
+        private Mock<IHostController> mockHostController;
+        private Mock<CachingProvider> mockCachingProvider;
+        private Mock<DataProvider> mockDataProvider;
+        private Mock<ILocaleController> mockLocaleController;
+        private Mock<ISearchHelper> mockSearchHelper;
+        private Mock<IUserController> mockUserController;
+
+        private SearchControllerImpl searchController;
+        private IInternalSearchController internalSearchController;
+        private LuceneControllerImpl luceneController;
+
+        public enum SearchTypeIds
+        {
+            ModuleSearchTypeId = 1,
+            TabSearchTypeId,
+            DocumentSearchTypeId,
+            UrlSearchTypeId,
+            OtherSearchTypeId,
+            UnknownSearchTypeId,
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            ComponentFactory.Container = new SimpleContainer();
+            MockComponentProvider.ResetContainer();
+
+            this.mockDataProvider = MockComponentProvider.CreateDataProvider();
+            this.mockLocaleController = MockComponentProvider.CreateLocaleController();
+            this.mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
+
+            this.mockUserController = new Mock<IUserController>();
+            this.mockHostController = new Mock<IHostController>();
+            this.mockSearchHelper = new Mock<ISearchHelper>();
+
+            this.SetupDataProvider();
+            this.SetupHostController();
+            this.SetupSearchHelper();
+            this.SetupLocaleController();
+
+            this.mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>())).Returns((int portalId, int userId) => this.GetUserByIdCallback(portalId, userId));
+            UserController.SetTestableInstance(this.mockUserController.Object);
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            this.CreateNewLuceneControllerInstance();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            this.luceneController.Dispose();
+            this.DeleteIndexFolder();
+            InternalSearchController.ClearInstance();
+            UserController.ClearInstance();
+            SearchHelper.ClearInstance();
+            LuceneController.ClearInstance();
+            this.luceneController = null;
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        public void SearchController_Search_Throws_On_Null_Query()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => this.searchController.SiteSearch(null));
+        }
+
+        [Test]
+        public void SearchController_Search_Throws_On_Empty_TypeId_Collection()
+        {
+            // Arrange
+
+            // Act, Assert
+            Assert.Throws<ArgumentException>(() => this.searchController.SiteSearch(new SearchQuery { KeyWords = "word" }));
+        }
+
+        [Test]
+        public void SearchController_AddSearchDcoumet_Regex_Does_Not_Sleep_On_Bad_Text_During_Alt_Text_Parsing()
+        {
+            // Arrange
+            var document = new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "<<Click here for the complete city listing by a... ", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act, Assert
+            this.internalSearchController.AddSearchDocument(document);
+        }
+
+        [Test]
+        public void SearchController_AddSearchDcoumet_Regex_Does_Not_Sleep_On_Bad_Text_During_Alt_Text_Parsing2()
+        {
+            // Arrange
+            var document = new SearchDocument { UniqueKey = Guid.NewGuid().ToString(), Title = "<<Click here for the complete city listing by a... ", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act, Assert
+            Assert.DoesNotThrow(() => ExecuteWithTimeout(
+                    () =>
+                    {
+                        this.internalSearchController.AddSearchDocument(document);
+                        return false;
+                    }, TimeSpan.FromSeconds(1)));
+        }
+
+        [Test]
+        public void SearchController_Added_Item_IsRetrieved()
+        {
+            // Arrange
+            var doc = new SearchDocument { UniqueKey = "key01", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc);
+
+            var result = this.SearchForKeyword("hello");
+
+            // Assert
+            Assert.AreEqual(1, result.Results.Count);
+            Assert.AreEqual(result.Results[0].UniqueKey, doc.UniqueKey);
+            Assert.AreEqual(result.Results[0].Title, doc.Title);
+        }
+
+        [Test]
+        public void SearchController_EnsureIndexIsAppended_When_Index_Is_NotDeleted_InBetween()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                };
+
+            // Act
+
+            // Add first document
+            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = Guid.NewGuid().ToString(), SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            // first luceneQuery
+            var query1 = new SearchQuery { KeyWords = "fox", SearchTypeIds = new List<int> { OtherSearchTypeId } };
+            var search1 = this.searchController.SiteSearch(query1);
+
+            // Assert
+            Assert.AreEqual(1, search1.Results.Count);
+
+            // Add second document
+            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = Guid.NewGuid().ToString(), SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.CreateNewLuceneControllerInstance(); // to force a new reader for the next assertion
+
+            // second luceneQuery
+            var query2 = new SearchQuery { KeyWords = "fox", SearchTypeIds = new List<int> { OtherSearchTypeId } };
+            var search2 = this.searchController.SiteSearch(query2);
+
+            // Assert
+            Assert.AreEqual(2, search2.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_Getsearch_TwoTermsSearch()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                Line3,
+                Line4,
+                Line5,
+                };
+
+            this.AddLinesAsSearchDocs(docs);
+
+            // Act
+            var search = this.SearchForKeyword("fox jumps");
+
+            // Assert
+            Assert.AreEqual(docs.Length, search.Results.Count);
+
+            // Assert.AreEqual("brown <b>fox jumps</b> over the lazy dog ", search.Results[0].Snippet);
+            // Assert.AreEqual("quick <b>fox jumps</b> over the black dog ", search.Results[1].Snippet);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TwoTermsSearch()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                Line3,
+                Line4,
+                Line5,
+                };
+
+            this.AddLinesAsSearchDocs(docs);
+
+            // Act
+            var search = this.SearchForKeyword("fox jumps");
+
+            // Assert
+            Assert.AreEqual(docs.Length, search.Results.Count);
+
+            // Assert.AreEqual("brown <b>fox jumps</b> over the lazy dog ", search.Results[0].Snippet);
+            // Assert.AreEqual("quick <b>fox jumps</b> over the black dog ", search.Results[1].Snippet);
+        }
+
+        [Test]
+        public void SearchController_GetResult_PortalIdSearch()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, PortalIds = new List<int> { PortalId0 } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_SearchTypeIdSearch()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_SearchFindsAnalyzedVeryLongWords()
+        {
+            // Arrange
+            // const string fieldName = Constants.ContentTag;
+            const string veryLongWord = // 107 characters
+                "NowIsTheTimeForAllGoodMenToComeToTheAidOfTheirCountryalsoIsTheTimeForAllGoodMenToComeToTheAidOfTheirCountry";
+
+            var doc = new SearchDocument
+            {
+                Title = veryLongWord,
+                UniqueKey = Guid.NewGuid().ToString(),
+                SearchTypeId = ModuleSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                ModuleId = 1,
+                ModuleDefId = 1,
+            };
+            this.internalSearchController.AddSearchDocument(doc);
+
+            // Act
+            var query = new SearchQuery { KeyWords = veryLongWord, SearchTypeIds = new List<int> { ModuleSearchTypeId } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual("<b>" + veryLongWord + "</b>", this.StipEllipses(search.Results[0].Snippet).Trim());
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsNoResultsWhenHavingNoPermission()
+        {
+            // Arrange
+            this.AddStandardSearchDocs(DocumentSearchTypeId);
+
+            // Act
+            var result = this.SearchForKeyword("fox", DocumentSearchTypeId);
+
+            // Assert
+            // by default AuthorUserId = 0 which have no permission, so this passes
+            Assert.AreEqual(0, result.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1A()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 1,
+                PageSize = 4,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(query.PageSize, result.Results.Count);
+            Assert.AreEqual(new[] { 6, 7, 8, 9 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1B()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 1,
+                PageSize = 6,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(query.PageSize, result.Results.Count);
+            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1C()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 1,
+                PageSize = 8,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(query.PageSize, result.Results.Count);
+            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17, 18, 19 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1D()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId; // user should have access to some documnets here
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 1,
+                PageSize = 100,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(4 * 3, result.TotalHits);
+            Assert.AreEqual(4 * 3, result.Results.Count);
+            Assert.AreEqual(new[] { 6, 7, 8, 9, 16, 17, 18, 19, 26, 27, 28, 29 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1E()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = TabSearchTypeId; // user should have access to all documnets here
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 1,
+                PageSize = 10,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).Skip(1).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs, result.TotalHits);
+            Assert.AreEqual(query.PageSize, result.Results.Count);
+            Assert.AreEqual(Enumerable.Range(1, 9).ToArray(), ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage1F()
+        {
+            // Arrange
+            const int maxDocs = 100;
+            const int stype = TabSearchTypeId; // user should have access to all documnets here
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 10,
+                PageSize = 10,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs, result.TotalHits);
+            Assert.AreEqual(query.PageSize, result.Results.Count);
+            Assert.AreEqual(Enumerable.Range(90, 10).ToArray(), ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2A()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 2,
+                PageSize = 5,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(5, result.Results.Count);
+            Assert.AreEqual(new[] { 17, 18, 19, 26, 27 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2B()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 2,
+                PageSize = 6,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(6, result.Results.Count);
+            Assert.AreEqual(new[] { 18, 19, 26, 27, 28, 29 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage2C()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var query = new SearchQuery
+            {
+                PageIndex = 2,
+                PageSize = 8,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(query);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(4, result.Results.Count);
+            Assert.AreEqual(new[] { 26, 27, 28, 29 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3A()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var queryPg3 = new SearchQuery
+            {
+                PageIndex = 3,
+                PageSize = 4,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(queryPg3);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(queryPg3.PageSize, result.Results.Count);
+            Assert.AreEqual(new[] { 26, 27, 28, 29 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3B()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var queryPg3 = new SearchQuery
+            {
+                PageIndex = 3,
+                PageSize = 5,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(queryPg3);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(2, result.Results.Count);
+            Assert.AreEqual(new[] { 28, 29 }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage3C()
+        {
+            // Arrange
+            const int maxDocs = 30;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var queryPg3 = new SearchQuery
+            {
+                PageIndex = 3,
+                PageSize = 8,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(queryPg3);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - 18, result.TotalHits);
+            Assert.AreEqual(0, result.Results.Count);
+            Assert.AreEqual(new int[] { }, ids);
+        }
+
+        [Test]
+        public void SearchController_SecurityTrimmedTest_ReturnsExpectedResultsForPage5()
+        {
+            // Arrange
+            const int maxDocs = 100;
+            const int stype = DocumentSearchTypeId;
+            this.SetupSecurityTrimmingDocs(maxDocs, stype);
+
+            // Act
+            var queryPg3 = new SearchQuery
+            {
+                PageIndex = 5,
+                PageSize = 8,
+                KeyWords = "fox",
+                SearchTypeIds = new[] { stype },
+            };
+
+            var result = this.searchController.SiteSearch(queryPg3);
+            var ids = result.Results.Select(doc => doc.AuthorUserId).ToArray();
+
+            // Assert
+            Assert.AreEqual(maxDocs - (10 * 6), result.TotalHits);
+            Assert.AreEqual(queryPg3.PageSize, result.Results.Count);
+            Assert.AreEqual(new int[] { 86, 87, 88, 89, 96, 97, 98, 99 }, ids);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Returns_Correct_SuppliedData_When_Optionals_Are_Supplied()
+        {
+            // Arrange
+            var modifiedDateTime = DateTime.UtcNow;
+            var numericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue1 }, { NumericKey2, NumericValue2 } };
+            var keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value }, { KeyWord2Name, KeyWord2Value } };
+            var tags = new List<string> { Tag1, Tag2 };
+            var doc = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key",
+                SearchTypeId = ModuleSearchTypeId,
+                ModifiedTimeUtc = modifiedDateTime,
+                PortalId = PortalId12,
+                TabId = StandardTabId,
+                ModuleDefId = HtmlModuleDefId,
+                ModuleId = HtmlModuleId,
+                Description = "Description",
+                Body = "Body",
+                AuthorUserId = StandardAuthorId,
+                RoleId = StandardRoleId,
+                Permissions = StandardPermission,
+                QueryString = StandardQueryString,
+                Tags = tags,
+                NumericKeys = numericKeys,
+                Keywords = keywords,
+            };
+            this.internalSearchController.AddSearchDocument(doc);
+
+            // run luceneQuery on common keyword between both the docs
+            var search = this.SearchForKeywordInModule("Title");
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(PortalId12, search.Results[0].PortalId);
+            Assert.AreEqual(StandardTabId, search.Results[0].TabId);
+            Assert.AreEqual(HtmlModuleDefId, search.Results[0].ModuleDefId);
+            Assert.AreEqual(HtmlModuleId, search.Results[0].ModuleId);
+            Assert.AreEqual(ModuleSearchTypeId, search.Results[0].SearchTypeId);
+            Assert.AreEqual("Description", search.Results[0].Description);
+            Assert.AreEqual("Body", search.Results[0].Body);
+            Assert.AreEqual(StandardAuthorId, search.Results[0].AuthorUserId);
+            Assert.AreEqual(StandardRoleId, search.Results[0].RoleId);
+            Assert.AreEqual(modifiedDateTime.ToString(Constants.DateTimeFormat), search.Results[0].ModifiedTimeUtc.ToString(Constants.DateTimeFormat));
+            Assert.AreEqual(StandardPermission, search.Results[0].Permissions);
+            Assert.AreEqual(StandardQueryString, search.Results[0].QueryString);
+            Assert.AreEqual(StandardAuthorDisplayName, search.Results[0].AuthorName);
+            Assert.AreEqual(tags.Count, search.Results[0].Tags.Count());
+            Assert.AreEqual(tags[0], search.Results[0].Tags.ElementAt(0));
+            Assert.AreEqual(tags[1], search.Results[0].Tags.ElementAt(1));
+            Assert.AreEqual(numericKeys.Count, search.Results[0].NumericKeys.Count);
+            Assert.AreEqual(numericKeys[NumericKey1], search.Results[0].NumericKeys[NumericKey1]);
+            Assert.AreEqual(numericKeys[NumericKey2], search.Results[0].NumericKeys[NumericKey2]);
+            Assert.AreEqual(keywords.Count, search.Results[0].Keywords.Count);
+            Assert.AreEqual(keywords[KeyWord1Name], search.Results[0].Keywords[KeyWord1Name]);
+            Assert.AreEqual(keywords[KeyWord2Name], search.Results[0].Keywords[KeyWord2Name]);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Returns_EmptyData_When_Optionals_Are_Not_Supplied()
+        {
+            // Arrange
+            var modifiedDateTime = DateTime.UtcNow;
+            var doc = new SearchDocument
+            {
+                PortalId = PortalId0,
+                Title = "Title",
+                UniqueKey = "key",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = modifiedDateTime,
+            };
+            this.internalSearchController.AddSearchDocument(doc);
+
+            var search = this.SearchForKeyword("Title");
+
+            // Assert -
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(PortalId0, search.Results[0].PortalId);
+            Assert.AreEqual(0, search.Results[0].TabId);
+            Assert.AreEqual(0, search.Results[0].ModuleDefId);
+            Assert.AreEqual(0, search.Results[0].ModuleId);
+            Assert.AreEqual(OtherSearchTypeId, search.Results[0].SearchTypeId);
+            Assert.AreEqual(null, search.Results[0].Description);
+            Assert.AreEqual(null, search.Results[0].Body);
+            Assert.AreEqual(0, search.Results[0].AuthorUserId);
+            Assert.AreEqual(-1, search.Results[0].RoleId);
+            Assert.AreEqual(modifiedDateTime.ToString(Constants.DateTimeFormat), search.Results[0].ModifiedTimeUtc.ToString(Constants.DateTimeFormat));
+            Assert.AreEqual(null, search.Results[0].Permissions);
+            Assert.AreEqual(null, search.Results[0].QueryString);
+            Assert.AreEqual(null, search.Results[0].AuthorName);
+            Assert.AreEqual(0, search.Results[0].Tags.Count());
+            Assert.AreEqual(0, search.Results[0].NumericKeys.Count);
+            Assert.AreEqual(0, search.Results[0].Keywords.Count);
+        }
+
+        [Test]
+        public void SearchController_GetsHighlightedDesc()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                Line3,
+                Line4,
+                Line5,
+                };
+            this.AddLinesAsSearchDocs(docs);
+
+            // Act
+            var search = this.SearchForKeyword("fox");
+
+            // Assert
+            Assert.AreEqual(docs.Length, search.Results.Count);
+            Assert.IsTrue(
+                new[]
+                {
+                  "brown <b>fox</b> jumps over the lazy dog",
+                  "quick <b>fox</b> jumps over the black dog - Italian",
+                  "gold <b>fox</b> jumped over the lazy black dog",
+                  "e red <b>fox</b> jumped over the lazy dark gray dog",
+                  "quick <b>fox</b> jumps over the white dog - los de el Espana",
+                }.SequenceEqual(search.Results.Select(r => this.StipEllipses(r.Snippet))),
+                "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Snippet)));
+        }
+
+        [Test]
+        public void SearchController_CorrectDocumentCultureIsUsedAtIndexing()
+        {
+            // Arrange
+            // assign a culture that is different than the current one
+            var isNonEnglishEnv = Thread.CurrentThread.CurrentCulture.Name != CultureEsEs;
+            string cultureCode, title, searchWord;
+
+            // Act
+            if (isNonEnglishEnv)
+            {
+                cultureCode = CultureEsEs;
+                searchWord = "zorro";
+                title = "los rápidos saltos de zorro sobre el perro negro";
+            }
+            else
+            {
+                cultureCode = CultureEnUs;
+                searchWord = "fox";
+                title = Line3;
+            }
+
+            this.internalSearchController.AddSearchDocument(
+                new SearchDocument
+                {
+                    Title = title,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = OtherSearchTypeId,
+                    ModifiedTimeUtc = DateTime.UtcNow,
+                    CultureCode = cultureCode,
+                });
+            this.internalSearchController.Commit();
+
+            var searches = this.SearchForKeyword(searchWord);
+
+            // Assert
+            Assert.AreEqual(1, searches.TotalHits);
+            Assert.AreEqual(cultureCode, searches.Results[0].CultureCode);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TimeRangeSearch_Ignores_When_Only_BeginDate_Specified()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, BeginModifiedTimeUtc = DateTime.Now };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TimeRangeSearch_Resturns_Scoped_Results_When_BeginDate_Is_After_End_Date()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                BeginModifiedTimeUtc = DateTime.Now,
+                EndModifiedTimeUtc = DateTime.Now.AddSeconds(-1),
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TimeRangeSearch_Resturns_Scoped_Results_When_Both_Dates_Specified()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+            var stypeIds = new List<int> { ModuleSearchTypeId };
+            var utcNow = DateTime.UtcNow.AddDays(1);
+            const SortFields sfield = SortFields.LastModified;
+
+            // Act and Assert - just a bit later
+            var query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddSeconds(1), EndModifiedTimeUtc = utcNow.AddDays(1) };
+            var search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(0, search.Results.Count);
+
+            // Act and Assert - 10 day
+            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-10), EndModifiedTimeUtc = utcNow.AddDays(1) };
+            search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(Line5, search.Results[0].Title);
+
+            // Act and Assert - 1 year or so
+            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-368), EndModifiedTimeUtc = utcNow.AddDays(1) };
+            search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(2, search.Results.Count);
+            Assert.AreEqual(Line5, search.Results[0].Title);
+            Assert.AreEqual(Line4, search.Results[1].Title);
+
+            // Act and Assert - 2 years or so
+            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-800), EndModifiedTimeUtc = utcNow.AddDays(1) };
+            search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(3, search.Results.Count);
+            Assert.AreEqual(Line5, search.Results[0].Title);
+            Assert.AreEqual(Line4, search.Results[1].Title);
+            Assert.AreEqual(Line3, search.Results[2].Title);
+
+            // Act and Assert - 3 years or so
+            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-1200), EndModifiedTimeUtc = utcNow.AddDays(1) };
+            search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(4, search.Results.Count);
+            Assert.AreEqual(Line5, search.Results[0].Title);
+            Assert.AreEqual(Line4, search.Results[1].Title);
+            Assert.AreEqual(Line3, search.Results[2].Title);
+            Assert.AreEqual(Line2, search.Results[3].Title);
+
+            // Act and Assert - 2 to 3 years or so
+            query = new SearchQuery { SearchTypeIds = stypeIds, SortField = sfield, BeginModifiedTimeUtc = utcNow.AddDays(-1200), EndModifiedTimeUtc = utcNow.AddDays(-800) };
+            search = this.searchController.SiteSearch(query);
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(Line2, search.Results[0].Title);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Single_Tag_Returns_Single_Result()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0 } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Single_Tag_With_Space_Returns_Single_Result()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0WithSpace } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Lowercase_Search_Returns_PropercaseTag_Single_Result()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { TagNeutral.ToLowerInvariant() } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Single_Tag_Returns_Two_Results()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag1 } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(2, search.Results.Count);
+            Assert.AreEqual(Tag0, search.Results[0].Tags.ElementAt(0));
+            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(1));
+            Assert.AreEqual(Tag1, search.Results[1].Tags.ElementAt(0));
+            Assert.AreEqual(Tag2, search.Results[1].Tags.ElementAt(1));
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Two_Tags_Returns_Nothing()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag0, Tag4 } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(0, search.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_Two_Tags_Returns_Single_Results()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery { SearchTypeIds = new List<int> { ModuleSearchTypeId }, Tags = new List<string> { Tag1, Tag2 } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(0));
+            Assert.AreEqual(Tag2, search.Results[0].Tags.ElementAt(1));
+        }
+
+        [Test]
+        public void SearchController_GetResult_TagSearch_With_Vowel_Tags_Returns_Data()
+        {
+            // Arrange
+            const string keyword = "awesome";
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { TagTootsie } };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, Tags = new List<string> { TagTootsie } };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_GetResult_Throws_When_CustomNumericField_Is_Specified_And_CustomSortField_Is_Not()
+        {
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomNumericField,
+            };
+
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_GetResult_Throws_When_CustomStringField_Is_Specified_And_CustomSortField_Is_Not()
+        {
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomStringField,
+            };
+
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_GetResult_Throws_When_NumericKey_Is_Specified_And_CustomSortField_Is_Not()
+        {
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.NumericKey,
+            };
+
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_GetResult_Throws_When_Keyword_Is_Specified_And_CustomSortField_Is_Not()
+        {
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Keyword,
+            };
+
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Date_Returns_Latest_Docs_First()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.LastModified,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
+
+            Assert.AreEqual(Tag3, search.Results[1].Tags.ElementAt(0));
+            Assert.AreEqual(Tag4, search.Results[1].Tags.ElementAt(1));
+            Assert.AreEqual(TagLatest, search.Results[1].Tags.ElementAt(2));
+
+            Assert.AreEqual(Tag2, search.Results[0].Tags.ElementAt(0));
+            Assert.AreEqual(Tag3, search.Results[0].Tags.ElementAt(1));
+            Assert.AreEqual(TagIt.ToLowerInvariant(), search.Results[0].Tags.ElementAt(2));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Date_Ascending_Returns_Earliest_Docs_First()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.LastModified,
+                SortDirection = SortDirections.Ascending,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.Greater(search.Results[1].DisplayModifiedTime, search.Results[0].DisplayModifiedTime);
+            Assert.Greater(search.Results[2].DisplayModifiedTime, search.Results[1].DisplayModifiedTime);
+            Assert.Greater(search.Results[3].DisplayModifiedTime, search.Results[2].DisplayModifiedTime);
+
+            Assert.AreEqual(Tag0, search.Results[0].Tags.ElementAt(0));
+            Assert.AreEqual(Tag1, search.Results[0].Tags.ElementAt(1));
+            Assert.AreEqual(TagOldest, search.Results[0].Tags.ElementAt(2));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_NumericKeys_Ascending_Returns_Smaller_Numers_First()
+        {
+            var added = this.AddDocumentsWithNumericKeys();
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "Title",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.NumericKey,
+                SortDirection = SortDirections.Ascending,
+                CustomSortField = NumericKey1,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.Greater(search.Results[1].NumericKeys[NumericKey1], search.Results[0].NumericKeys[NumericKey1]);
+            Assert.Greater(search.Results[2].NumericKeys[NumericKey1], search.Results[1].NumericKeys[NumericKey1]);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_NumericKeys_Descending_Returns_Bigger_Numbers_First()
+        {
+            var added = this.AddDocumentsWithNumericKeys();
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "Title",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.NumericKey,
+                SortDirection = SortDirections.Descending,
+                CustomSortField = NumericKey1,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.Greater(search.Results[0].NumericKeys[NumericKey1], search.Results[1].NumericKeys[NumericKey1]);
+            Assert.Greater(search.Results[1].NumericKeys[NumericKey1], search.Results[2].NumericKeys[NumericKey1]);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Title_Ascending_Returns_Alphabetic_Ascending()
+        {
+            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
+
+            var added = this.AddDocuments(titles, "animal");
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "animal",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.Title,
+                SortDirection = SortDirections.Ascending,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+
+            var count = 0;
+            foreach (var title in titles.OrderBy(s => s))
+            {
+                Assert.AreEqual(title, search.Results[count++].Title);
+            }
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Title_Descending_Returns_Alphabetic_Descending()
+        {
+            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
+
+            var added = this.AddDocuments(titles, "animal");
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "animal",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.Title,
+                SortDirection = SortDirections.Descending,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+
+            var count = 0;
+            foreach (var title in titles.OrderByDescending(s => s))
+            {
+                Assert.AreEqual(title, search.Results[count++].Title);
+            }
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Keyword_Ascending_Returns_Alphabetic_Ascending()
+        {
+            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
+
+            var added = this.AddDocumentsWithKeywords(titles, "animal");
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "animal",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.Keyword,
+                SortDirection = SortDirections.Ascending,
+                CustomSortField = KeyWord1Name,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+
+            var count = 0;
+            foreach (var title in titles.OrderBy(s => s))
+            {
+                Assert.AreEqual(title, search.Results[count++].Keywords[KeyWord1Name]);
+            }
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Keyword_Descending_Returns_Alphabetic_Descending()
+        {
+            var titles = new List<string> { "cat", "ant", "dog", "antelope", "zebra", "yellow", " " };
+
+            var added = this.AddDocumentsWithKeywords(titles, "animal");
+
+            // Act
+            var query = new SearchQuery
+            {
+                KeyWords = "animal",
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                SortField = SortFields.Keyword,
+                SortDirection = SortDirections.Descending,
+                CustomSortField = KeyWord1Name,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+
+            var count = 0;
+            foreach (var title in titles.OrderByDescending(s => s))
+            {
+                Assert.AreEqual(title, search.Results[count++].Keywords[KeyWord1Name]);
+            }
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sort_By_Unknown_StringField_In_Descending_Order_Does_Not_Throw()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomStringField,
+                SortDirection = SortDirections.Descending,
+                CustomSortField = "unknown",
+            };
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sort_By_Unknown_StringField_In_Ascending_Order_Does_Not_Throw()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomStringField,
+                SortDirection = SortDirections.Ascending,
+                CustomSortField = "unknown",
+            };
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sort_By_Unknown_NumericField_In_Descending_Order_Does_Not_Throw()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomNumericField,
+                SortDirection = SortDirections.Descending,
+                CustomSortField = "unknown",
+            };
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sort_By_Unknown_NumericField_In_Ascending_Order_Does_Not_Throw()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.CustomNumericField,
+                SortDirection = SortDirections.Ascending,
+                CustomSortField = "unknown",
+            };
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Relevance_Returns_TopHit_Docs_First()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                KeyWords = "brown OR fox",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Snippet.Contains("brown") && search.Results[0].Snippet.Contains("dog"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_RelevanceAndTitleKeyword_Returns_TopHit_Docs_First()
+        {
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
+
+            // Arrange
+            var added = this.AddSearchDocsForCustomBoost();
+            this.CreateNewLuceneControllerInstance(true);
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                KeyWords = "Hello",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello1"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_RelevanceAndSubjectKeyword_Returns_TopHit_Docs_First()
+        {
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
+            this.CreateNewLuceneControllerInstance(true);
+
+            // Arrange
+            var added = this.AddSearchDocsForCustomBoost();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                KeyWords = "Hello",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello2"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_RelevanceAndCommentKeyword_Returns_TopHit_Docs_First()
+        {
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
+            this.CreateNewLuceneControllerInstance(true);
+
+            // Arrange
+            var added = this.AddSearchDocsForCustomBoost();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                KeyWords = "Hello",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello3"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_RelevanceAndAuthorKeyword_Returns_TopHit_Docs_First()
+        {
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(CustomBoost);
+            this.CreateNewLuceneControllerInstance(true);
+
+            // Arrange
+            var added = this.AddSearchDocsForCustomBoost();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                KeyWords = "Hello",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Body.Contains("Hello4"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_Sorty_By_Relevance_Ascending_Does_Not_Change_Sequence_Of_Results()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.Relevance,
+                SortDirection = SortDirections.Ascending,
+                KeyWords = "brown OR fox",
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(added, search.Results.Count);
+            Assert.AreEqual(true, search.Results[0].Snippet.Contains("brown") && search.Results[0].Snippet.Contains("dog"));
+        }
+
+        [Test]
+        public void SearchController_GetResult_By_Locale_Returns_Specific_And_Neutral_Locales()
+        {
+            // Arrange
+            this.AddStandardSearchDocs();
+
+            // Act
+            var query = new SearchQuery
+            {
+                SearchTypeIds = new List<int> { ModuleSearchTypeId },
+                SortField = SortFields.LastModified,
+                CultureCode = CultureItIt,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(2, search.Results.Count, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
+            Assert.AreEqual(Line3, search.Results[0].Title);
+            Assert.AreEqual(Line1, search.Results[1].Title);
+        }
+
+        [Test]
+        public void SearchController_EnsureOldDocument_Deleted_Upon_Second_Index_Content_With_Same_Key()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                };
+            const string docKey = "key1";
+
+            // Act
+
+            // Add first document
+            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            // Add second document with same key
+            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc2);
+
+            // run luceneQuery on common keyword between both the docs
+            var search = this.SearchForKeyword("fox");
+
+            // Assert - there should just be one entry - first one must have been removed.
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(docs[1], search.Results[0].Title);
+        }
+
+        [Test]
+        public void SearchController_Add_Does_Not_Throw_On_Empty_Url()
+        {
+            var doc = new SearchDocument
+            {
+                UniqueKey = Guid.NewGuid().ToString(),
+                SearchTypeId = OtherSearchTypeId,
+                Title = " ",
+                ModifiedTimeUtc = DateTime.UtcNow,
+                QueryString = "?foo=bar",
+            };
+
+            Assert.DoesNotThrow(() => this.internalSearchController.AddSearchDocument(doc));
+        }
+
+        [Test]
+        public void SearchController_Add_Does_Not_Throw_On_Empty_Title()
+        {
+            var doc = new SearchDocument
+            {
+                UniqueKey = Guid.NewGuid().ToString(),
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+            };
+
+            Assert.DoesNotThrow(() => this.internalSearchController.AddSearchDocument(doc));
+        }
+
+        [Test]
+        public void SearchController_EnsureOldDocument_Deleted_Upon_Second_Index_When_IsActive_Is_False()
+        {
+            // Arrange
+            string[] docs =
+            {
+                Line1,
+                Line2,
+                };
+            const string docKey = "key1";
+
+            // Act
+
+            // Add first document
+            var doc1 = new SearchDocument { Title = docs[0], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            // Add second document with same key
+            var doc2 = new SearchDocument { Title = docs[1], UniqueKey = docKey, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, IsActive = false };
+            this.internalSearchController.AddSearchDocument(doc2);
+
+            // run luceneQuery on common keyword between both the docs
+            var search = this.SearchForKeyword("fox");
+
+            // Assert - there should not be any record.
+            Assert.AreEqual(0, search.Results.Count);
+        }
+
+        // Note: these tests needs to pass through the analyzer which is utilized
+        //       in SearchControllerImpl but not LuceneControllerImpl.
+        [Test]
+        public void SearchController_SearchFindsAccentedAndNonAccentedWords()
+        {
+            // Arrange
+            string[] lines =
+            {
+                "zèbre or panthère",
+                "zebre without accent",
+                "panthere without accent",
+                };
+
+            this.AddLinesAsSearchDocs(lines);
+
+            // Act
+            var searches1 = this.SearchForKeyword("zèbre");
+            var searches2 = this.SearchForKeyword("zebre");
+
+            // Assert
+            Assert.AreEqual(2, searches1.TotalHits);
+            Assert.AreEqual("<b>z&#232;bre</b> or panth&#232;re", this.StipEllipses(searches1.Results[0].Snippet).Trim());
+            Assert.AreEqual("<b>zebre</b> without accent", this.StipEllipses(searches1.Results[1].Snippet).Trim());
+
+            Assert.AreEqual(2, searches2.TotalHits);
+            Assert.AreEqual("<b>z&#232;bre</b> or panth&#232;re", this.StipEllipses(searches2.Results[0].Snippet).Trim());
+            Assert.AreEqual("<b>zebre</b> without accent", this.StipEllipses(searches2.Results[1].Snippet).Trim());
+        }
+
+        [Test]
+        public void SearchController_PorterFilterTest()
+        {
+            // Arrange
+            string[] lines =
+            {
+                "field1_value",
+                "field2_value",
+                };
+
+            this.AddLinesAsSearchDocs(lines);
+
+            // Act
+            var search1 = this.SearchForKeyword(lines[0]);
+            var search2 = this.SearchForKeyword("\"" + lines[1] + "\"");
+
+            // Assert
+            Assert.AreEqual(1, search1.TotalHits);
+            Assert.AreEqual(1, search2.TotalHits);
+
+            Assert.AreEqual("<b>" + lines[0] + "</b>", this.StipEllipses(search1.Results[0].Snippet).Trim());
+            Assert.AreEqual("<b>" + lines[1] + "</b>", this.StipEllipses(search2.Results[0].Snippet).Trim());
+        }
+
+        [Test]
+        public void SearchController_SearchFindsStemmedWords()
+        {
+            // Arrange
+            string[] lines =
+            {
+                "I ride my bike to work",
+                "All team are riding their bikes",
+                "The boy rides his bike to school",
+                "This sentence is missing the bike ri... word",
+                };
+
+            this.AddLinesAsSearchDocs(lines);
+
+            // Act
+            var search = this.SearchForKeyword("ride");
+
+            // Assert
+            Assert.AreEqual(3, search.TotalHits);
+            Assert.AreEqual("I <b>ride</b> my bike to work", this.StipEllipses(search.Results[0].Snippet));
+            Assert.AreEqual("m are <b>riding</b> their bikes", this.StipEllipses(search.Results[1].Snippet));
+            Assert.AreEqual("e boy <b>rides</b> his bike to school", this.StipEllipses(search.Results[2].Snippet));
+        }
+
+        [Test]
+        public void SearchController_Search_Synonym_Works()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+
+            // Act
+            var search = this.SearchForKeywordInModule("wolf");
+
+            // Assert
+            Assert.AreEqual(added, search.TotalHits);
+
+            var snippets = search.Results.Select(result => this.StipEllipses(result.Snippet)).OrderBy(s => s).ToArray();
+            Assert.AreEqual("brown <b>fox</b> jumps over the lazy dog", snippets[0]);
+            Assert.AreEqual("e red <b>fox</b> jumped over the lazy dark gray dog", snippets[1]);
+            Assert.AreEqual("gold <b>fox</b> jumped over the lazy black dog", snippets[2]);
+            Assert.AreEqual("quick <b>fox</b> jumps over the black dog - Italian", snippets[3]);
+        }
+
+        [Test]
+        public void SearchController_Title_Ranked_Higher_Than_Body()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "Hello World" };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "cow is gone" };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("cow");
+
+            // Assert
+            Assert.AreEqual(result.TotalHits, 2);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Title_Ranked_Higher_Than_Body_Regardless_Of_Document_Sequence()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "cow is gone" };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("cow");
+
+            // Assert
+            Assert.AreEqual(result.TotalHits, 2);
+            Assert.AreEqual(doc3.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[1].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Title_Ranked_Higher_Than_Tag()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "Hello World" };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { "cow", "hello", "world" } };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "random text" };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+            var result = this.SearchForKeyword("cow");
+
+            // Assert
+            Assert.AreEqual(result.TotalHits, 2);
+            Console.WriteLine("first score: {0}  {1}", result.Results[0].UniqueKey, result.Results[0].DisplayScore);
+            Console.WriteLine("second score: {0}  {1}", result.Results[1].UniqueKey, result.Results[1].DisplayScore);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_RankingTest_With_Vowel()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "tootsie", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Tags = new List<string> { "tootsie" } };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Keywords = new Dictionary<string, string>() { { KeyWord1Name, "tootsie" } } };
+            var doc4 = new SearchDocument { UniqueKey = "key04", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Description = "tootsie" };
+            var doc5 = new SearchDocument { UniqueKey = "key05", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = "hello tootsie" };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+            this.internalSearchController.AddSearchDocument(doc5);
+
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("tootsie");
+
+            // Assert
+            Assert.AreEqual(5, result.TotalHits);
+            foreach (var searchResult in result.Results)
+            {
+                Console.WriteLine("{0} score: {1}", searchResult.UniqueKey, searchResult.DisplayScore);
+            }
+
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
+            Assert.AreEqual(doc4.UniqueKey, result.Results[3].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_FileNameTest_With_WildCard()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeywordWithWildCard("file");
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Full_FileNameTest_Without_WildCard()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeywordWithWildCard("file.ext");
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Full_FileNameTest_With_WildCard()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "file.ext", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("file.ext");
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Scope_By_FolderName()
+        {
+            // Arrange
+            this.AddFoldersAndFiles();
+
+            // Act
+            var result1 = this.SearchForKeyword("kw-folderName:Images/*");
+            var result2 = this.SearchForKeyword("kw-folderName:Images/DNN/*");
+            var result3 = this.SearchForKeywordWithWildCard("kw-folderName:Images/* AND spacer");
+
+            // Assert
+            Assert.AreEqual(5, result1.TotalHits);
+            Assert.AreEqual(2, result2.TotalHits);
+            Assert.AreEqual(1, result3.TotalHits);
+        }
+
+        [Test]
+        public void SearchController_Scope_By_FolderName_With_Spaces()
+        {
+            // Arrange
+            this.AddFoldersAndFiles();
+
+            // Act - Space is replaced by <
+            var query1 = new SearchQuery { KeyWords = "kw-folderName:Images/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = false };
+            var query2 = new SearchQuery { KeyWords = "kw-folderName:my<Images/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = true };
+            var query3 = new SearchQuery { KeyWords = "kw-folderName:my<Images/my<dnn/*", SearchTypeIds = new[] { OtherSearchTypeId }, WildCardSearch = true };
+            var result1 = this.searchController.SiteSearch(query1);
+            var result2 = this.searchController.SiteSearch(query2);
+            var result3 = this.searchController.SiteSearch(query3);
+
+            // Assert
+            Assert.AreEqual(5, result1.TotalHits);
+            Assert.AreEqual(5, result2.TotalHits);
+            Assert.AreEqual(2, result3.TotalHits);
+        }
+
+        [Test]
+        public void SearchController_EmailTest_With_WildCard()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "email@domain.com", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeywordWithWildCard("email@");
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Add_Use_Of_Module_Search_Type_Requires_ModuleDefinitionId()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Add_Use_Of_Module_Search_Type_Requires_ModuleId()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Add_Non_Module_Type_SearchId_Should_Not_Provide_ModuleDefinitionId()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Add_Non_Module_Type_SearchId_Should_Not_Provide_ModuleId()
+        {
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "awesome", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleId = HtmlModuleId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Search_For_ModuleId_Must_Have_Only_One_Search_Type_Id_Specified()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { DocumentSearchTypeId, OtherSearchTypeId }, ModuleId = IdeasModuleId };
+
+            // Act
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void SearchController_Search_For_ModuleId_Must_Have_Only_Module_Search_Type_Id_Specified()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, OtherSearchTypeId }, ModuleId = IdeasModuleId };
+
+            // Act
+            this.searchController.SiteSearch(query);
+        }
+
+        [Test]
+        public void SearchController_Search_For_Unknown_SearchTypeId_Does_Not_Throw_Exception()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = UnknownSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+            this.internalSearchController.AddSearchDocument(doc1);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { UnknownSearchTypeId } };
+
+            // Act
+            var result = this.searchController.SiteSearch(query);
+            Assert.AreEqual(0, result.TotalHits); // 0 due to security trimming
+            Assert.AreEqual(0, result.Results.Count);
+        }
+
+        [Test]
+        public void SearchController_Search_For_GroupId_Zero_Ignores_GroupId()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId0 };
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, RoleId = 0 };
+
+            // Act
+            var result = this.searchController.SiteSearch(query);
+            Assert.AreEqual(2, result.TotalHits);
+        }
+
+        [Test]
+        public void SearchController_Search_For_GroupId_Returns_Records_With_GroupIds_Only()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId532 };
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId }, RoleId = RoleId731 };
+
+            // Act
+            var result = this.searchController.SiteSearch(query);
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(RoleId731, result.Results[0].RoleId);
+        }
+
+        [Test]
+        public void SearchController_Search_For_GroupId_Returns_Records_With_GroupIds_Only_Even_In_Multi_SearchTypeId()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId532 };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { OtherSearchTypeId, ModuleSearchTypeId }, RoleId = RoleId731 };
+
+            // Act
+            var result = this.searchController.SiteSearch(query);
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(RoleId731, result.Results[0].RoleId);
+        }
+
+        [Test]
+        public void SearchController_Search_For_Two_ModuleDefinitions_Returns_Two_Only()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
+
+            var result = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(2, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Search_For_ModuleId_Returns_from_that_module_Only()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId }, ModuleId = IdeasModuleId };
+
+            var result = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(2, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Search_For_Module_Search_Type_And_Multiple_ModuleDefIds_Should_Return_From_Those_ModuleDefinitions_Only()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
+
+            var result = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(3, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Search_For_Multiple_Search_Types_Should_Return_Result_from_All_Sources()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = IdeasModuleDefId, ModuleId = IdeasModuleId };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
+            var doc5 = new SearchDocument { UniqueKey = "key05", Title = keyword, SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+            this.internalSearchController.AddSearchDocument(doc5);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, OtherSearchTypeId }, ModuleDefIds = new[] { IdeasModuleDefId, AnswersModuleDefId } };
+
+            var result = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(4, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+            Assert.AreEqual(doc3.UniqueKey, result.Results[2].UniqueKey);
+            Assert.AreEqual(doc5.UniqueKey, result.Results[3].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Search_For_ModuleSearchTypeId_With_Two_ModuleDefinitions_And_OtherSearchTypeId_Returns_Correct_Results()
+        {
+            // Arrange
+            const string keyword = "awesome";
+
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId, ModuleId = HtmlModuleId };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = HtmlModuleDefId, ModuleId = HtmlModuleId };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = AnswersModuleDefId, ModuleId = AnswersModuleId };
+            var doc4 = new SearchDocument { UniqueKey = "key04", Title = keyword, SearchTypeId = ModuleSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, ModuleDefId = BlogsoduleDefId, ModuleId = BlogsModuleId };
+            var doc5 = new SearchDocument { UniqueKey = "key05", Title = keyword, SearchTypeId = TabSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+            this.internalSearchController.AddSearchDocument(doc5);
+
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { ModuleSearchTypeId, TabSearchTypeId }, ModuleDefIds = new[] { HtmlModuleDefId } };
+
+            var result = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(3, result.TotalHits);
+            Assert.AreEqual(doc1.UniqueKey, result.Results[0].UniqueKey);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[1].UniqueKey);
+            Assert.AreEqual(doc5.UniqueKey, result.Results[2].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Works_With_Custom_Numeric_Querirs()
+        {
+            this.AddDocumentsWithNumericKeys();
+
+            // Act
+            var query = new SearchQuery
+            {
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue50 } },
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                WildCardSearch = false,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(NumericValue50, search.Results[0].NumericKeys[NumericKey1]);
+        }
+
+        [Test]
+        public void SearchController_GetResult_Works_With_CustomKeyword_Querirs()
+        {
+            this.AddDocumentsWithKeywords();
+
+            // Act
+            var query = new SearchQuery
+            {
+                CustomKeywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value } },
+                SearchTypeIds = new List<int> { OtherSearchTypeId },
+                WildCardSearch = false,
+            };
+            var search = this.searchController.SiteSearch(query);
+
+            // Assert
+            Assert.AreEqual(1, search.Results.Count);
+            Assert.AreEqual(KeyWord1Value, search.Results[0].Keywords[KeyWord1Name]);
+        }
+
+        [Test]
+        public void SearchController_EnableLeadingWildcard_Should_Not_Return_Results_When_Property_Is_False()
+        {
+            this.mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("N");
+
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, false);
+
+            // Assert
+            Assert.AreEqual(0, result.TotalHits);
+        }
+
+        [Test]
+        public void SearchController_EnableLeadingWildcard_Should_Return_Results_When_Property_Is_True()
+        {
+            this.mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("N");
+
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, true);
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_EnableLeadingWildcard_Should_Return_Results_When_Property_Is_False_But_Host_Setting_Is_True()
+        {
+            this.mockHostController.Setup(c => c.GetString("Search_AllowLeadingWildcard", It.IsAny<string>())).Returns("Y");
+
+            // Arrange
+            var doc1 = new SearchDocument { UniqueKey = "key01", Title = "cow is gone", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc2 = new SearchDocument { UniqueKey = "key02", Title = "Hello World", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+            var doc3 = new SearchDocument { UniqueKey = "key03", Title = "I'm here", SearchTypeId = OtherSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, Body = string.Empty };
+
+            // Act
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.Commit();
+
+            var result = this.SearchForKeyword("rld", OtherSearchTypeId, true, false);
+
+            // Assert
+            Assert.AreEqual(1, result.TotalHits);
+            Assert.AreEqual(doc2.UniqueKey, result.Results[0].UniqueKey);
+        }
+
+        [Test]
+        public void SearchController_Search_StopWords_Works()
+        {
+            // Arrange
+            var added = this.AddStandardSearchDocs();
+            this.internalSearchController.Commit();
+
+            // Act
+            var search = this.SearchForKeywordInModule("the");
+
+            // Assert
+            // the word "the" is ignored in all languages except es-ES
+            Assert.AreEqual(1, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
+
+            // Act
+            search = this.SearchForKeywordInModule("over");
+
+            // Assert
+            // we won't find "over" in neutral, en-US, and en-CA documents, but will find it in the es-ES and it-IT documents.
+            Assert.AreEqual(2, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
+
+            // Act
+            search = this.SearchForKeywordInModule("los");
+
+            // Assert
+            // we won't find "los" in the es-ES document.
+            Assert.AreEqual(0, search.TotalHits, "Found: " + string.Join(Environment.NewLine, search.Results.Select(r => r.Title)));
+        }
+
+        /// <summary>
+        /// Executes function proc on a separate thread respecting the given timeout value.
+        /// </summary>
+        /// <typeparam name="R"></typeparam>
+        /// <param name="proc">The function to execute.</param>
+        /// <param name="timeout">The timeout duration.</param>
+        /// <returns>R.</returns>
+        /// <remarks>From: http://stackoverflow.com/questions/9460661/implementing-regex-timeout-in-net-4.</remarks>
+        private static R ExecuteWithTimeout<R>(Func<R> proc, TimeSpan timeout)
+        {
+            var r = default(R); // init default return value
+            Exception ex = null; // records inter-thread exception
+
+            // define a thread to wrap 'proc'
+            var t = new Thread(() =>
+            {
+                try
+                {
+                    r = proc();
+                }
+                catch (Exception e)
+                {
+                    // this can get set to ThreadAbortException
+                    ex = e;
+
+                    Console.WriteLine("Exception hit");
+                }
+            });
+
+            t.Start(); // start running 'proc' thread wrapper
+
+            // from docs: "The Start method does not return until the new thread has started running."
+            if (t.Join(timeout) == false)
+            {
+                t.Abort(); // die evil thread!
+
+                // Abort raises the ThreadAbortException
+                int i = 0;
+                while ((t.Join(1) == false) && (i < 20))
+                {
+                    // 20 ms wait possible here
+                    i++;
+                }
+
+                if (i >= 20)
+                {
+                    // we didn't abort, might want to log this or take some other action
+                    // this can happen if you are doing something indefinitely hinky in a
+                    // finally block (cause the finally be will executed before the Abort
+                    // completes.
+                    Console.WriteLine("Abort didn't work as expected");
+                }
+            }
+
+            if (ex != null)
+            {
+                throw ex; // oops
+            }
+
+            return r; // ah!
+        }
+
+        private void CreateNewLuceneControllerInstance(bool reCreate = false)
+        {
+            InternalSearchController.SetTestableInstance(new InternalSearchControllerImpl());
+            this.internalSearchController = InternalSearchController.Instance;
+            this.searchController = new SearchControllerImpl();
+
+            if (!reCreate)
+            {
+                this.DeleteIndexFolder();
+
+                if (this.luceneController != null)
+                {
+                    LuceneController.ClearInstance();
+                    this.luceneController.Dispose();
+                }
+
+                this.luceneController = new LuceneControllerImpl();
+                LuceneController.SetTestableInstance(this.luceneController);
+            }
+        }
+
+        private void SetupHostController()
+        {
+            this.mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(SearchIndexFolder);
+            this.mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).Returns(this.readerStaleTimeSpan);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTitleBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchTagBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchKeywordBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchDescriptionBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(Constants.DefaultSearchAuthorBoost);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMinLen);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(Constants.DefaultMaxLen);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(DefaultSearchRetryTimes);
+            this.mockHostController.As<IHostSettingsService>();
+        }
+
+        private void SetupLocaleController()
+        {
+            this.mockLocaleController.Setup(l => l.GetLocale(It.IsAny<string>())).Returns(new Locale { LanguageId = -1, Code = string.Empty });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEnCa)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
+            this.mockLocaleController.Setup(l => l.GetLocale(CultureEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
+
+            this.mockLocaleController.Setup(l => l.GetLocale(It.IsAny<int>())).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnUs)).Returns(new Locale { LanguageId = LanguageIdEnUs, Code = CultureEnUs });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEnFr)).Returns(new Locale { LanguageId = LanguageIdEnFr, Code = CultureEnCa });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdItIt)).Returns(new Locale { LanguageId = LanguageIdItIt, Code = CultureItIt });
+            this.mockLocaleController.Setup(l => l.GetLocale(LanguageIdEsEs)).Returns(new Locale { LanguageId = LanguageIdEsEs, Code = CultureEsEs });
+        }
+
+        private void SetupDataProvider()
+        {
+            // Standard DataProvider Path for Logging
+            this.mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+
+            DataTableReader searchTypes = null;
+            this.mockDataProvider.Setup(ds => ds.GetAllSearchTypes())
+                     .Callback(() => searchTypes = this.GetAllSearchTypes().CreateDataReader())
+                     .Returns(() => searchTypes);
+
+            this.mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
+        }
+
+        private IDataReader GetPortalsCallBack(string culture)
+        {
+            return this.GetPortalCallBack(PortalId0, CultureEnUs);
+        }
+
+        private IDataReader GetPortalCallBack(int portalId, string culture)
+        {
+            var table = new DataTable("Portal");
+
+            var cols = new[]
+                        {
+                            "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
+                            "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
+                            "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
+                            "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            const int homePage = 1;
+            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null,
+                    "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null,
+                    "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0",
+                    null, homePage.ToString("D"), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
+
+            return table.CreateDataReader();
+        }
+
+        private void SetupSearchHelper()
+        {
+            this.mockSearchHelper.Setup(c => c.GetSearchMinMaxLength()).Returns(new Tuple<int, int>(Constants.DefaultMinLen, Constants.DefaultMaxLen));
+            this.mockSearchHelper.Setup(c => c.GetSynonyms(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>())).Returns<int, string, string>(this.GetSynonymsCallBack);
+            this.mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns((string name) => new SearchType { SearchTypeId = 0, SearchTypeName = name });
+            this.mockSearchHelper.Setup(x => x.GetSearchTypeByName(It.IsAny<string>())).Returns<string>(this.GetSearchTypeByNameCallback);
+            this.mockSearchHelper.Setup(x => x.GetSearchTypes()).Returns(this.GetSearchTypes());
+            this.mockSearchHelper.Setup(x => x.GetSearchStopWords(It.IsAny<int>(), It.IsAny<string>())).Returns(new SearchStopWords());
+            this.mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEsEs)).Returns(
+                new SearchStopWords
+                {
+                    PortalId = 0,
+                    CultureCode = CultureEsEs,
+                    StopWords = "los,de,el",
+                });
+            this.mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEnUs)).Returns(
+                new SearchStopWords
+                {
+                    PortalId = 0,
+                    CultureCode = CultureEnUs,
+                    StopWords = "the,over",
+                });
+            this.mockSearchHelper.Setup(x => x.GetSearchStopWords(0, CultureEnCa)).Returns(
+                new SearchStopWords
+                {
+                    PortalId = 0,
+                    CultureCode = CultureEnCa,
+                    StopWords = "the,over",
+                });
+
+            this.mockSearchHelper.Setup(x => x.RephraseSearchText(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns<string, bool, bool>(new SearchHelperImpl().RephraseSearchText);
+            this.mockSearchHelper.Setup(x => x.StripTagsNoAttributes(It.IsAny<string>(), It.IsAny<bool>())).Returns((string html, bool retainSpace) => html);
+            SearchHelper.SetTestableInstance(this.mockSearchHelper.Object);
+        }
+
+        private SearchType GetSearchTypeByNameCallback(string searchTypeName)
+        {
+            var searchType = new SearchType { SearchTypeName = searchTypeName, SearchTypeId = 0 };
+            switch (searchTypeName)
+            {
+                case ModuleSearchTypeName:
+                    searchType.SearchTypeId = ModuleSearchTypeId;
+                    break;
+                case TabSearchTypeName:
+                    searchType.SearchTypeId = TabSearchTypeId;
+                    break;
+                case OtherSearchTypeName:
+                    searchType.SearchTypeId = OtherSearchTypeId;
+                    break;
+                case DocumentSearchTypeName:
+                    searchType.SearchTypeId = DocumentSearchTypeId;
+                    break;
+                case UrlSearchTypeName:
+                    searchType.SearchTypeId = UrlSearchTypeId;
+                    break;
+            }
+
+            return searchType;
+        }
+
+        private IList<string> GetSynonymsCallBack(int portalId, string cultureCode, string term)
+        {
+            var synonyms = new List<string>();
+            if (term == "fox")
+            {
+                synonyms.Add("wolf");
+            }
+
+            return synonyms;
+        }
+
+        private UserInfo GetUserByIdCallback(int portalId, int userId)
+        {
+            if (portalId == PortalId12 && userId == StandardAuthorId)
+            {
+                return new UserInfo { UserID = userId, DisplayName = StandardAuthorDisplayName };
+            }
+
+            return null;
+        }
+
+        private DataTable GetAllSearchTypes()
+        {
+            var dtSearchTypes = new DataTable("SearchTypes");
+            var pkId = dtSearchTypes.Columns.Add("SearchTypeId", typeof(int));
+            dtSearchTypes.Columns.Add("SearchTypeName", typeof(string));
+            dtSearchTypes.Columns.Add("SearchResultClass", typeof(string));
+            dtSearchTypes.PrimaryKey = new[] { pkId };
+
+            // Create default Crawler
+            dtSearchTypes.Rows.Add(ModuleSearchTypeId, ModuleSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(TabSearchTypeId, TabSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(OtherSearchTypeId, OtherSearchTypeName, FakeResultControllerClass);
+            dtSearchTypes.Rows.Add(DocumentSearchTypeId, DocumentSearchTypeName, NoPermissionFakeResultControllerClass);
+            dtSearchTypes.Rows.Add(UrlSearchTypeId, UrlSearchTypeName, FakeResultControllerClass);
+
+            return dtSearchTypes;
+        }
+
+        private IEnumerable<SearchType> GetSearchTypes()
+        {
+            var searchTypes = new List<SearchType>
+                {
+                    new SearchType { SearchTypeId = ModuleSearchTypeId, SearchTypeName = ModuleSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                    new SearchType { SearchTypeId = TabSearchTypeId, SearchTypeName = TabSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                    new SearchType { SearchTypeId = OtherSearchTypeId, SearchTypeName = OtherSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                    new SearchType { SearchTypeId = DocumentSearchTypeId, SearchTypeName = DocumentSearchTypeName, SearchResultClass = NoPermissionFakeResultControllerClass },
+                    new SearchType { SearchTypeId = UrlSearchTypeId, SearchTypeName = UrlSearchTypeName, SearchResultClass = FakeResultControllerClass },
+                };
+
+            return searchTypes;
+        }
+
+        private void DeleteIndexFolder()
+        {
+            try
+            {
+                if (Directory.Exists(SearchIndexFolder))
+                {
+                    Directory.Delete(SearchIndexFolder, true);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+            }
+        }
+
+        /// <summary>
+        /// Returns few SearchDocs.
+        /// </summary>
+        private IEnumerable<SearchDocument> GetStandardSearchDocs(int searchTypeId = ModuleSearchTypeId)
+        {
+            var searchDocs = new List<SearchDocument>
+            {
+                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag0, Tag1, TagOldest, Tag0WithSpace }, Title = Line1 },
+                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag1, Tag2, TagNeutral }, Title = Line2, CultureCode = CultureEnUs },
+                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag2, Tag3, TagIt }, Title = Line3, CultureCode = CultureItIt },
+                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag3, Tag4, TagLatest }, Title = Line4, CultureCode = CultureEnCa },
+                new SearchDocument { PortalId = PortalId0, Tags = new List<string> { Tag2, Tag3, TagIt }, Title = Line5, CultureCode = CultureEsEs },
+            };
+
+            var now = DateTime.UtcNow.AddYears(-searchDocs.Count);
+            var i = 0;
+
+            foreach (var searchDocument in searchDocs)
+            {
+                searchDocument.SearchTypeId = searchTypeId;
+                searchDocument.UniqueKey = Guid.NewGuid().ToString();
+                searchDocument.ModuleId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleId : -1;
+                searchDocument.ModuleDefId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleDefId : -1;
+                searchDocument.ModifiedTimeUtc = now.AddYears(++i); // last added is the newest
+            }
+
+            return searchDocs;
+        }
+
+        private IEnumerable<SearchDocument> GetSearchDocsForCustomBoost(int searchTypeId = ModuleSearchTypeId)
+        {
+            var searchDocs = new List<SearchDocument>
+            {
+                new SearchDocument { PortalId = PortalId0, Title = Line1, Keywords = { { "title", "Hello" } }, Body = "Hello1 World" },
+                new SearchDocument { PortalId = PortalId0, Title = Line2, Keywords = { { "subject", "Hello" } }, Body = "Hello2 World" },
+                new SearchDocument { PortalId = PortalId0, Title = Line3, Keywords = { { "comments", "Hello" } }, Body = "Hello3 World" },
+                new SearchDocument { PortalId = PortalId0, Title = Line4, Keywords = { { "authorname", "Hello" } }, Body = "Hello4 World" },
+            };
+
+            var now = DateTime.UtcNow.AddYears(-searchDocs.Count);
+            var i = 0;
+
+            foreach (var searchDocument in searchDocs)
+            {
+                searchDocument.SearchTypeId = searchTypeId;
+                searchDocument.UniqueKey = Guid.NewGuid().ToString();
+                searchDocument.ModuleId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleId : -1;
+                searchDocument.ModuleDefId = (searchTypeId == ModuleSearchTypeId) ? HtmlModuleDefId : -1;
+                searchDocument.ModifiedTimeUtc = now.AddYears(++i); // last added is the newest
+            }
+
+            return searchDocs;
+        }
+
+        /// <summary>
+        /// Adds standarad SearchDocs in Lucene Index.
+        /// </summary>
+        /// <returns>Number of dcuments added.</returns>
+        private int AddStandardSearchDocs(int searchTypeId = ModuleSearchTypeId)
+        {
+            var docs = this.GetStandardSearchDocs(searchTypeId).ToArray();
+            this.internalSearchController.AddSearchDocuments(docs);
+            return docs.Length;
+        }
+
+        private int AddSearchDocsForCustomBoost(int searchTypeId = ModuleSearchTypeId)
+        {
+            var docs = this.GetSearchDocsForCustomBoost(searchTypeId).ToArray();
+            this.internalSearchController.AddSearchDocuments(docs);
+            return docs.Length;
+        }
+
+        private int AddDocumentsWithNumericKeys(int searchTypeId = OtherSearchTypeId)
+        {
+            var doc1 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key1",
+                Body = "hello",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue50 } },
+            };
+            var doc2 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key2",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue100 } },
+            };
+            var doc3 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key3",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue200 } },
+            };
+            var doc4 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key4",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue500 } },
+            };
+            var doc5 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key5",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                NumericKeys = new Dictionary<string, int>() { { NumericKey1, NumericValue1000 } },
+            };
+
+            var docs = new List<SearchDocument>() { doc1, doc2, doc3, doc4, doc5 };
+
+            this.internalSearchController.AddSearchDocuments(docs);
+
+            return docs.Count;
+        }
+
+        private int AddDocumentsWithKeywords(int searchTypeId = OtherSearchTypeId)
+        {
+            var doc1 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key1",
+                Body = "hello",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord1Value } },
+            };
+            var doc2 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key2",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord2Value } },
+            };
+            var doc3 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key3",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord3Value } },
+            };
+            var doc4 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key4",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord4Value } },
+            };
+            var doc5 = new SearchDocument
+            {
+                Title = "Title",
+                UniqueKey = "key5",
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, KeyWord5Value } },
+            };
+
+            var docs = new List<SearchDocument>() { doc1, doc2, doc3, doc4, doc5 };
+
+            this.internalSearchController.AddSearchDocuments(docs);
+
+            return docs.Count;
+        }
+
+        private int AddDocuments(IList<string> titles, string body, int searchTypeId = OtherSearchTypeId)
+        {
+            var count = 0;
+            foreach (var doc in titles.Select(title => new SearchDocument
+            {
+                Title = title,
+                UniqueKey = Guid.NewGuid().ToString(),
+                Body = body,
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+            }))
+            {
+                this.internalSearchController.AddSearchDocument(doc);
+                count++;
+            }
+
+            return count;
+        }
+
+        private int AddDocumentsWithKeywords(IEnumerable<string> keywords, string title, int searchTypeId = OtherSearchTypeId)
+        {
+            var count = 0;
+            foreach (var doc in keywords.Select(keyword => new SearchDocument
+            {
+                Title = title,
+                UniqueKey = Guid.NewGuid().ToString(),
+                Keywords = new Dictionary<string, string>() { { KeyWord1Name, keyword } },
+                SearchTypeId = OtherSearchTypeId,
+                ModifiedTimeUtc = DateTime.UtcNow,
+                PortalId = PortalId12,
+            }))
+            {
+                this.internalSearchController.AddSearchDocument(doc);
+                count++;
+            }
+
+            return count;
+        }
+
+        private void AddLinesAsSearchDocs(IList<string> lines, int searchTypeId = OtherSearchTypeId)
+        {
+            var now = DateTime.UtcNow - TimeSpan.FromSeconds(lines.Count());
+            var i = 0;
+
+            this.internalSearchController.AddSearchDocuments(
+                lines.Select(line =>
+                    new SearchDocument
+                    {
+                        Title = line,
+                        UniqueKey = Guid.NewGuid().ToString(),
+                        SearchTypeId = searchTypeId,
+                        ModifiedTimeUtc = now.AddSeconds(i++),
+                    }).ToList());
+        }
+
+        private SearchResults SearchForKeyword(string keyword, int searchTypeId = OtherSearchTypeId, bool useWildcard = false, bool allowLeadingWildcard = false)
+        {
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId }, WildCardSearch = useWildcard, AllowLeadingWildcard = allowLeadingWildcard };
+            return this.searchController.SiteSearch(query);
+        }
+
+        private SearchResults SearchForKeywordWithWildCard(string keyword, int searchTypeId = OtherSearchTypeId)
+        {
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId }, WildCardSearch = true };
+            return this.searchController.SiteSearch(query);
+        }
+
+        private SearchResults SearchForKeywordInModule(string keyword, int searchTypeId = ModuleSearchTypeId)
+        {
+            var query = new SearchQuery { KeyWords = keyword, SearchTypeIds = new[] { searchTypeId } };
+            return this.searchController.SiteSearch(query);
+        }
+
+        private string StipEllipses(string text)
+        {
+            return text.Replace("...", string.Empty).Trim();
+        }
+
+        /// <summary>
+        /// Sets up some data for testing security trimming.
+        /// In the tests below, the users will have access to the follwoing documents
+        /// { 6, 7, 8, 9, 16, 17, 18, 19, 26, 27, 28, 29, ..., etc. }
+        /// The tests check that pagination qith various page sizes returns the proper groupings.
+        /// </summary>
+        private void SetupSecurityTrimmingDocs(int totalDocs, int searchType = DocumentSearchTypeId)
+        {
+            var docModifyTime = DateTime.UtcNow - TimeSpan.FromSeconds(totalDocs);
+            for (var i = 0; i < totalDocs; i++)
+            {
+                this.internalSearchController.AddSearchDocument(new SearchDocument
+                {
+                    AuthorUserId = i,
+                    Title = "Fox and Dog",
+                    Body = Line1,
+                    Tags = new[] { Tag0, Tag1 },
+                    SearchTypeId = searchType,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    ModifiedTimeUtc = docModifyTime.AddSeconds(i),
+                });
+            }
+        }
+
+        private void AddFoldersAndFiles()
+        {
+            var allFiles = new Dictionary<string, string>
+                               {
+                                { "Awesome-Cycles-Logo.png", "Images/" },
+                                { "Banner1.jpg", "Images/" },
+                                { "Banner2.jpg", "Images/" },
+                                { "bike-powered.png", "Images/DNN/" },
+                                { "Spacer.gif", "Images/DNN/" },
+                                { "monday.png", "My<Images/" },
+                                { "tuesday.jpg", "My<Images/" },
+                                { "wednesday.jpg", "My<Images/" },
+                                { "thursday.png", "My<Images/My<DNN/" },
+                                { "friday.gif", "My<Images/My<DNN/" },
+                               };
+
+            foreach (var file in allFiles)
+            {
+                var doc = new SearchDocument
+                {
+                    Title = file.Key,
+                    UniqueKey = Guid.NewGuid().ToString(),
+                    SearchTypeId = OtherSearchTypeId,
+                    ModifiedTimeUtc = DateTime.UtcNow,
+                    Keywords = new Dictionary<string, string> { { "folderName", file.Value.ToLowerInvariant() } },
+                };
+                this.internalSearchController.AddSearchDocument(doc);
+            }
+
+            this.internalSearchController.Commit();
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchHelperTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchHelperTests.cs
index 65d0ba2247a..d68bc794382 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchHelperTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchHelperTests.cs	
@@ -2,411 +2,414 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Search
-{
-    using System;
-    using System.Data;
+namespace DotNetNuke.Tests.Core.Controllers.Search
+{
+    using System;
+    using System.Data;
     using System.Linq;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Search.Internals;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Search.Internals;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///  Testing various aspects of SearchController.
-    /// </summary>
-    [TestFixture]
-    public class SearchHelperTests
-    {
-        private const int OtherSearchTypeId = 2;
-        private const string TermDNN = "DNN";
-        private const string TermDotNetNuke = "DotnetNuke";
-        private const string TermLaptop = "Laptop";
-        private const string TermNotebook = "Notebook";
-        private const string TermJump = "Jump";
-        private const string TermLeap = "Leap";
-        private const string TermHop = "Hop";
-        private const int PortalId0 = 0;
-        private const string CultureEnUs = "en-US";
-        private Mock<DataProvider> _dataProvider;
-        private Mock<CachingProvider> _cachingProvider;
-        private SearchHelperImpl _searchHelper;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var serviceCollection = new ServiceCollection();
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///  Testing various aspects of SearchController.
+    /// </summary>
+    [TestFixture]
+    public class SearchHelperTests
+    {
+        private const int OtherSearchTypeId = 2;
+        private const string TermDNN = "DNN";
+        private const string TermDotNetNuke = "DotnetNuke";
+        private const string TermLaptop = "Laptop";
+        private const string TermNotebook = "Notebook";
+        private const string TermJump = "Jump";
+        private const string TermLeap = "Leap";
+        private const string TermHop = "Hop";
+        private const int PortalId0 = 0;
+        private const string CultureEnUs = "en-US";
+        private Mock<DataProvider> _dataProvider;
+        private Mock<CachingProvider> _cachingProvider;
+        private SearchHelperImpl _searchHelper;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            ComponentFactory.Container = new SimpleContainer();
-            this._cachingProvider = MockComponentProvider.CreateDataCacheProvider();
-            this._dataProvider = MockComponentProvider.CreateDataProvider();
-            this.SetupDataProvider();
-            this._searchHelper = new SearchHelperImpl();
-            DataCache.ClearCache();
-        }
-
-        [TearDown]
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            ComponentFactory.Container = new SimpleContainer();
+            this._cachingProvider = MockComponentProvider.CreateDataCacheProvider();
+            this._dataProvider = MockComponentProvider.CreateDataProvider();
+            this.SetupDataProvider();
+            this._searchHelper = new SearchHelperImpl();
+            DataCache.ClearCache();
+        }
+
+        [TearDown]
         public void TearDown()
         {
             Globals.DependencyProvider = null;
-        }
-
-        [Test]
-        public void SearchHelper_GetSynonyms_Two_Terms_Returns_Correct_Results()
-        {
-            // Arrange
-
-            // Act
-            var synonyms = this._searchHelper.GetSynonyms(PortalId0, CultureEnUs, TermDNN).ToArray();
-
-            // Assert
-            Assert.AreEqual(1, synonyms.Count());
-            Assert.AreEqual(TermDotNetNuke.ToLowerInvariant(), synonyms[0]);
-        }
-
-        [Test]
-        public void SearchHelper_GetSynonyms_Three_Terms_Returns_Correct_Results()
-        {
-            // Arrange
-
-            // Act
-            var synonyms = this._searchHelper.GetSynonyms(PortalId0, CultureEnUs, TermHop).ToArray();
-
-            // Assert
-            Assert.AreEqual(2, synonyms.Count());
-            Assert.AreEqual(TermJump.ToLowerInvariant(), synonyms[0]);
-            Assert.AreEqual(TermLeap.ToLowerInvariant(), synonyms[1]);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_NoWildCardButExact_1()
-        {
-            // Arrange
-            const string inPhrase = "\"brown fox\"";
-            const string expected = inPhrase;
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_NoWildCardButExact_2()
-        {
-            // Arrange
-            const string inPhrase = "\"brown fox\" -\"(Lazy) dog\" jumps";
-            const string expected = inPhrase;
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_NoWildCardNoExact()
-        {
-            // Arrange
-            const string inPhrase = "(brown) OR (fox AND dog) +jumbs";
-            const string expected = inPhrase;
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_0()
-        {
-            // Arrange
-            const string inPhrase = "fox dog";
-            const string expected = "(fox OR fox*) (dog OR dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_1()
-        {
-            // Arrange
-            const string inPhrase = "(lazy-dog)";
-            const string expected = "(lazy-dog OR lazy-dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_2()
-        {
-            // Arrange
-            const string inPhrase = "fox (dog)";
-            const string expected = "(fox OR fox*) (dog OR dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_3()
-        {
-            // Arrange
-            const string inPhrase = "(dog) fox";
-            const string expected = "(dog OR dog*) (fox OR fox*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_4()
-        {
-            // Arrange
-            const string inPhrase = "brown fox (lazy) dog";
-            const string expected = "(brown OR brown*) (fox OR fox*) (lazy OR lazy*) (dog OR dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_5()
-        {
-            // Arrange
-            const string inPhrase = "(brown fox) lazy dog";
-            const string expected = "((brown OR brown*) (fox OR fox*)) (lazy OR lazy*) (dog OR dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_6()
-        {
-            // Arrange
-            const string inPhrase = "brown fox (lazy dog)";
-            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) (dog OR dog*))";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_7()
-        {
-            // Arrange
-            const string inPhrase = "brown fox (lazy AND dog)";
-            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) AND (dog OR dog*))";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardNoExact_8()
-        {
-            // Arrange
-            const string inPhrase = "brown fox (lazy and dog)";
-            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) (and OR and*) (dog OR dog*))";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardWithExact_1()
-        {
-            // Arrange
-            const string inPhrase = "\"brown fox\"";
-            const string expected = inPhrase;
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardWithExact_2()
-        {
-            // Arrange
-            const string inPhrase = "\"brown fox\" dog";
-            const string expected = "\"brown fox\" (dog OR dog*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardWithExact_3()
-        {
-            // Arrange
-            const string inPhrase = "The +\"brown fox\" -\"Lazy dog\" jumps";
-            const string expected = "(The OR The*) +\"brown fox\" -\"Lazy dog\" (jumps OR jumps*)";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-        public void SearchHelper_Rephrase_WildCardWithTilde_4()
-        {
-            // Arrange
-            const string inPhrase = "dog jump~2";
-            const string expected = "(dog OR dog*) jump~2";
-
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        [Test]
-
-        // Arrange
-        [TestCase("Cäu", "(Cau OR Cau*)")]
-        [TestCase("Cäutätörül", "(Cautatorul OR Cautatorul*)")]
-        [TestCase("Ãbcdef", "(Abcdef OR Abcdef*)")]
-        public void SearchHelper_Rephrase_AccentedCharsReplaced_Replaced(string inPhrase, string expected)
-        {
-            // Act
-            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
-
-            // Assert
-            Assert.AreEqual(expected, analyzed);
-        }
-
-        private void SetupDataProvider()
-        {
-            // Standard DataProvider Path for Logging
-            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-
-            this._dataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
-
-            this._dataProvider.Setup(d => d.GetPortalSettings(It.IsAny<int>(), It.IsAny<string>())).Returns<int, string>(this.GetPortalSettingsCallBack);
-
-            var dataTable = new DataTable("SynonymsGroups");
-            var pkId = dataTable.Columns.Add("SynonymsGroupID", typeof(int));
-            dataTable.Columns.Add("SynonymsTags", typeof(string));
-            dataTable.Columns.Add("CreatedByUserID", typeof(int));
-            dataTable.Columns.Add("CreatedOnDate", typeof(DateTime));
-            dataTable.Columns.Add("LastModifiedByUserID", typeof(int));
-            dataTable.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-            dataTable.Columns.Add("PortalID", typeof(int));
-
-            dataTable.PrimaryKey = new[] { pkId };
-
-            // Create some test data
-            var now = DateTime.Now;
-            dataTable.Rows.Add(1, string.Join(",", new[] { TermDNN, TermDotNetNuke }), 1, now, 1, now, 0);
-            dataTable.Rows.Add(2, string.Join(",", new[] { TermLaptop, TermNotebook }), 1, now, 1, now, 0);
-            dataTable.Rows.Add(3, string.Join(",", new[] { TermJump, TermLeap, TermHop }), 1, now, 1, now, 0);
-
-            this._dataProvider.Setup(x => x.GetAllSynonymsGroups(0, It.IsAny<string>())).Returns(dataTable.CreateDataReader());
-        }
-
-        private IDataReader GetPortalSettingsCallBack(int portalId, string culture)
-        {
-            var table = new DataTable("PortalSettings");
-
-            var cols = new string[]
-                           {
-                            "SettingName", "SettingValue", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
-                           };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            table.Rows.Add("SearchAdminInitialization", "true", "-1", DateTime.Now, "-1", DateTime.Now, CultureEnUs);
-
-            return table.CreateDataReader();
-        }
-
-        private IDataReader GetPortalsCallBack(string culture)
-        {
-            return this.GetPortalCallBack(PortalId0, CultureEnUs);
-        }
-
-        private IDataReader GetPortalCallBack(int portalId, string culture)
-        {
-            DataTable table = new DataTable("Portal");
-
-            var cols = new string[]
-                           {
-                               "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
-                               "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
-                               "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
-                               "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
-                           };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            var homePage = 1;
-            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null, "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null, "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0", null, homePage.ToString(), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
-
-            return table.CreateDataReader();
-        }
-    }
-}
+        }
+
+        [Test]
+        public void SearchHelper_GetSynonyms_Two_Terms_Returns_Correct_Results()
+        {
+            // Arrange
+
+            // Act
+            var synonyms = this._searchHelper.GetSynonyms(PortalId0, CultureEnUs, TermDNN).ToArray();
+
+            // Assert
+            Assert.AreEqual(1, synonyms.Count());
+            Assert.AreEqual(TermDotNetNuke.ToLowerInvariant(), synonyms[0]);
+        }
+
+        [Test]
+        public void SearchHelper_GetSynonyms_Three_Terms_Returns_Correct_Results()
+        {
+            // Arrange
+
+            // Act
+            var synonyms = this._searchHelper.GetSynonyms(PortalId0, CultureEnUs, TermHop).ToArray();
+
+            // Assert
+            Assert.AreEqual(2, synonyms.Count());
+            Assert.AreEqual(TermJump.ToLowerInvariant(), synonyms[0]);
+            Assert.AreEqual(TermLeap.ToLowerInvariant(), synonyms[1]);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_NoWildCardButExact_1()
+        {
+            // Arrange
+            const string inPhrase = "\"brown fox\"";
+            const string expected = inPhrase;
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_NoWildCardButExact_2()
+        {
+            // Arrange
+            const string inPhrase = "\"brown fox\" -\"(Lazy) dog\" jumps";
+            const string expected = inPhrase;
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_NoWildCardNoExact()
+        {
+            // Arrange
+            const string inPhrase = "(brown) OR (fox AND dog) +jumbs";
+            const string expected = inPhrase;
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, false);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_0()
+        {
+            // Arrange
+            const string inPhrase = "fox dog";
+            const string expected = "(fox OR fox*) (dog OR dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_1()
+        {
+            // Arrange
+            const string inPhrase = "(lazy-dog)";
+            const string expected = "(lazy-dog OR lazy-dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_2()
+        {
+            // Arrange
+            const string inPhrase = "fox (dog)";
+            const string expected = "(fox OR fox*) (dog OR dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_3()
+        {
+            // Arrange
+            const string inPhrase = "(dog) fox";
+            const string expected = "(dog OR dog*) (fox OR fox*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_4()
+        {
+            // Arrange
+            const string inPhrase = "brown fox (lazy) dog";
+            const string expected = "(brown OR brown*) (fox OR fox*) (lazy OR lazy*) (dog OR dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_5()
+        {
+            // Arrange
+            const string inPhrase = "(brown fox) lazy dog";
+            const string expected = "((brown OR brown*) (fox OR fox*)) (lazy OR lazy*) (dog OR dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_6()
+        {
+            // Arrange
+            const string inPhrase = "brown fox (lazy dog)";
+            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) (dog OR dog*))";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_7()
+        {
+            // Arrange
+            const string inPhrase = "brown fox (lazy AND dog)";
+            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) AND (dog OR dog*))";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardNoExact_8()
+        {
+            // Arrange
+            const string inPhrase = "brown fox (lazy and dog)";
+            const string expected = "(brown OR brown*) (fox OR fox*) ((lazy OR lazy*) (and OR and*) (dog OR dog*))";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardWithExact_1()
+        {
+            // Arrange
+            const string inPhrase = "\"brown fox\"";
+            const string expected = inPhrase;
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardWithExact_2()
+        {
+            // Arrange
+            const string inPhrase = "\"brown fox\" dog";
+            const string expected = "\"brown fox\" (dog OR dog*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardWithExact_3()
+        {
+            // Arrange
+            const string inPhrase = "The +\"brown fox\" -\"Lazy dog\" jumps";
+            const string expected = "(The OR The*) +\"brown fox\" -\"Lazy dog\" (jumps OR jumps*)";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+        public void SearchHelper_Rephrase_WildCardWithTilde_4()
+        {
+            // Arrange
+            const string inPhrase = "dog jump~2";
+            const string expected = "(dog OR dog*) jump~2";
+
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        [Test]
+
+        // Arrange
+        [TestCase("Cäu", "(Cau OR Cau*)")]
+        [TestCase("Cäutätörül", "(Cautatorul OR Cautatorul*)")]
+        [TestCase("Ãbcdef", "(Abcdef OR Abcdef*)")]
+        public void SearchHelper_Rephrase_AccentedCharsReplaced_Replaced(string inPhrase, string expected)
+        {
+            // Act
+            var analyzed = this._searchHelper.RephraseSearchText(inPhrase, true);
+
+            // Assert
+            Assert.AreEqual(expected, analyzed);
+        }
+
+        private void SetupDataProvider()
+        {
+            // Standard DataProvider Path for Logging
+            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+
+            this._dataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
+
+            this._dataProvider.Setup(d => d.GetPortalSettings(It.IsAny<int>(), It.IsAny<string>())).Returns<int, string>(this.GetPortalSettingsCallBack);
+
+            var dataTable = new DataTable("SynonymsGroups");
+            var pkId = dataTable.Columns.Add("SynonymsGroupID", typeof(int));
+            dataTable.Columns.Add("SynonymsTags", typeof(string));
+            dataTable.Columns.Add("CreatedByUserID", typeof(int));
+            dataTable.Columns.Add("CreatedOnDate", typeof(DateTime));
+            dataTable.Columns.Add("LastModifiedByUserID", typeof(int));
+            dataTable.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+            dataTable.Columns.Add("PortalID", typeof(int));
+
+            dataTable.PrimaryKey = new[] { pkId };
+
+            // Create some test data
+            var now = DateTime.Now;
+            dataTable.Rows.Add(1, string.Join(",", new[] { TermDNN, TermDotNetNuke }), 1, now, 1, now, 0);
+            dataTable.Rows.Add(2, string.Join(",", new[] { TermLaptop, TermNotebook }), 1, now, 1, now, 0);
+            dataTable.Rows.Add(3, string.Join(",", new[] { TermJump, TermLeap, TermHop }), 1, now, 1, now, 0);
+
+            this._dataProvider.Setup(x => x.GetAllSynonymsGroups(0, It.IsAny<string>())).Returns(dataTable.CreateDataReader());
+        }
+
+        private IDataReader GetPortalSettingsCallBack(int portalId, string culture)
+        {
+            var table = new DataTable("PortalSettings");
+
+            var cols = new string[]
+                           {
+                            "SettingName", "SettingValue", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
+                           };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            table.Rows.Add("SearchAdminInitialization", "true", "-1", DateTime.Now, "-1", DateTime.Now, CultureEnUs);
+
+            return table.CreateDataReader();
+        }
+
+        private IDataReader GetPortalsCallBack(string culture)
+        {
+            return this.GetPortalCallBack(PortalId0, CultureEnUs);
+        }
+
+        private IDataReader GetPortalCallBack(int portalId, string culture)
+        {
+            DataTable table = new DataTable("Portal");
+
+            var cols = new string[]
+                           {
+                               "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
+                               "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
+                               "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
+                               "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
+                           };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            var homePage = 1;
+            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null, "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null, "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0", null, homePage.ToString(), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
+
+            return table.CreateDataReader();
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Social/RelationshipControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Social/RelationshipControllerTests.cs
index 1cedf9e940f..988127da998 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Social/RelationshipControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Social/RelationshipControllerTests.cs	
@@ -2,1278 +2,1280 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Controllers.Social
-{
-    using System;
-    using System.Collections.Generic;
+namespace DotNetNuke.Tests.Core.Controllers.Social
+{
+    using System;
+    using System.Collections.Generic;
     using System.Data;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Entities.Users.Social;
-    using DotNetNuke.Entities.Users.Social.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Log.EventLog;
-    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Entities.Users.Social;
+    using DotNetNuke.Entities.Users.Social.Data;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Log.EventLog;
+    using DotNetNuke.Tests.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
 
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
-
-    /// <summary>
-    ///  Testing various aspects of RelationshipController.
-    /// </summary>
-    [TestFixture]
-    public class RelationshipControllerTests
-    {
-        private Mock<CachingProvider> mockCachingProvider;
-        private Mock<IPortalController> _portalController;
-        private Mock<IPortalGroupController> _portalGroupController;
-
-        private DataTable dtRelationshipTypes;
-        private DataTable dtRelationships;
-        private DataTable dtUserRelationships;
-        private DataTable dtUserRelationshipPreferences;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var serviceCollection = new ServiceCollection();
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///  Testing various aspects of RelationshipController.
+    /// </summary>
+    [TestFixture]
+    public class RelationshipControllerTests
+    {
+        private Mock<CachingProvider> mockCachingProvider;
+        private Mock<IPortalController> _portalController;
+        private Mock<IPortalGroupController> _portalGroupController;
+
+        private DataTable dtRelationshipTypes;
+        private DataTable dtRelationships;
+        private DataTable dtUserRelationships;
+        private DataTable dtUserRelationshipPreferences;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            ComponentFactory.Container = new SimpleContainer();
-            var mockDataProvider = MockComponentProvider.CreateDataProvider();
-            mockDataProvider.Setup(dp => dp.GetProviderPath()).Returns(string.Empty);
-
-            this.mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
-            MockComponentProvider.CreateEventLogController();
-
-            this._portalController = new Mock<IPortalController>();
-            PortalController.SetTestableInstance(this._portalController.Object);
-
-            this._portalGroupController = new Mock<IPortalGroupController>();
-            PortalGroupController.RegisterInstance(this._portalGroupController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("PerformanceSetting")).Returns("0");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            var mockUserController = new Mock<IUserController>();
-            mockUserController.Setup(c => c.GetCurrentUserInfo()).Returns(new UserInfo() { UserID = 1 });
-            UserController.SetTestableInstance(mockUserController.Object);
-
-            this.CreateLocalizationProvider();
-
-            this.SetupDataTables();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            ComponentFactory.Container = null;
-            PortalController.ClearInstance();
-            UserController.ClearInstance();
-        }
-
-        [Test]
-        public void RelationshipController_Constructor_Throws_On_Null_DataService()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => new RelationshipControllerImpl(null, mockEventLogController.Object));
-        }
-
-        [Test]
-        public void RelationshipController_Constructor_Throws_On_Null_EventLogController()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-
-            // Act, Assert
-            Assert.Throws<ArgumentNullException>(() => new RelationshipControllerImpl(mockDataService.Object, null));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_DeleteRelationshipType_Throws_On_Null_RelationshipType()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.DeleteRelationshipType(null);
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationshipType_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-            };
-
-            // Act
-            relationshipController.DeleteRelationshipType(relationshipType);
-
-            // Assert
-            mockDataService.Verify(d => d.DeleteRelationshipType(Constants.SOCIAL_FollowerRelationshipTypeID));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationshipType_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-                Name = Constants.SOCIAL_RelationshipTypeName,
-            };
-
-            // Act
-            relationshipController.DeleteRelationshipType(relationshipType);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_RelationshipType_Deleted, Constants.SOCIAL_RelationshipTypeName, Constants.SOCIAL_FollowerRelationshipTypeID);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationshipType_Calls_DataCache_RemoveCache()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-            };
-
-            // Act
-            relationshipController.DeleteRelationshipType(relationshipType);
-
-            // Assert
-            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
-        }
-
-        [Test]
-        public void RelationshipController_GetAllRelationshipTypes_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationshipTypes = relationshipController.GetAllRelationshipTypes();
-
-            // Assert
-            mockDataService.Verify(d => d.GetAllRelationshipTypes());
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipType_Calls_DataService_If_Not_Cached()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationshipTypes = relationshipController.GetRelationshipType(Constants.SOCIAL_FriendRelationshipTypeID);
-
-            // Assert
-            mockDataService.Verify(d => d.GetAllRelationshipTypes());
-        }
-
-        [Test]
-        [TestCase(Constants.SOCIAL_FriendRelationshipTypeID)]
-        [TestCase(Constants.SOCIAL_FollowerRelationshipTypeID)]
-        public void RelationshipController_GetRelationshipType_Returns_RelationshipType_For_Valid_ID(int relationshipTypeId)
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationshipType = relationshipController.GetRelationshipType(relationshipTypeId);
-
-            // Assert
-            Assert.AreEqual(relationshipTypeId, relationshipType.RelationshipTypeId);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipType_Returns_Null_For_InValid_ID()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationshipType = relationshipController.GetRelationshipType(Constants.SOCIAL_InValidRelationshipType);
-
-            // Assert
-            Assert.IsNull(relationshipType);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_SaveRelationshipType_Throws_On_Null_RelationshipType()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.SaveRelationshipType(null);
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationshipType_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-            };
-
-            // Act
-            relationshipController.SaveRelationshipType(relationshipType);
-
-            // Assert
-            mockDataService.Verify(d => d.SaveRelationshipType(relationshipType, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationshipType_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-                Name = Constants.SOCIAL_RelationshipTypeName,
-            };
-
-            // Act
-            relationshipController.SaveRelationshipType(relationshipType);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_RelationshipType_Updated, Constants.SOCIAL_RelationshipTypeName);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationshipType_Calls_DataCache_RemoveCache()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-            };
-
-            // Act
-            relationshipController.SaveRelationshipType(relationshipType);
-
-            // Assert
-            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_DeleteRelationship_Throws_On_Null_Relationship()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.DeleteRelationship(null);
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationship_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var relationship = new Relationship()
-            {
-                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
-            };
-
-            // Act
-            relationshipController.DeleteRelationship(relationship);
-
-            // Assert
-            mockDataService.Verify(d => d.DeleteRelationship(Constants.SOCIAL_FollowerRelationshipID));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationship_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var relationship = new Relationship()
-            {
-                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
-                Name = Constants.SOCIAL_RelationshipName,
-            };
-
-            // Act
-            relationshipController.DeleteRelationship(relationship);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_Relationship_Deleted, Constants.SOCIAL_RelationshipName, Constants.SOCIAL_FollowerRelationshipID);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteRelationship_Calls_DataCache_RemoveCache()
-        {
-            // Arrange
-            var portalId = 1;
-            var relationshipController = this.CreateRelationshipController();
-            var cacheKey = CachingProvider.GetCacheKey(string.Format(DataCache.RelationshipByPortalIDCacheKey, portalId));
-            var relationship = new Relationship()
-            {
-                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
-                PortalId = portalId,
-                UserId = -1,
-            };
-
-            // Act
-            relationshipController.DeleteRelationship(relationship);
-
-            // Assert
-            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
-        }
-
-        [Test]
-        [TestCase(Constants.SOCIAL_FriendRelationshipID, DefaultRelationshipTypes.Friends)]
-        [TestCase(Constants.SOCIAL_FollowerRelationshipID, DefaultRelationshipTypes.Followers)]
-        public void RelationshipController_GetRelationship_Returns_Relationship_For_Valid_ID(int relationshipId, DefaultRelationshipTypes defaultType)
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            this.dtRelationships.Rows.Add(relationshipId, defaultType, defaultType.ToString(), defaultType.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
-            mockDataService.Setup(md => md.GetRelationship(relationshipId)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationship = relationshipController.GetRelationship(relationshipId);
-
-            // Assert
-            Assert.AreEqual(relationshipId, relationship.RelationshipId);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationship_Returns_Null_For_InValid_ID()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            mockDataService.Setup(md => md.GetRelationship(It.IsAny<int>())).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationship = relationshipController.GetRelationship(Constants.SOCIAL_InValidRelationship);
-
-            // Assert
-            Assert.IsNull(relationship);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipsByUserID_Returns_List_Of_Relationships_For_Valid_User()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            for (int i = 1; i <= 5; i++)
-            {
-                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
-                                            DefaultRelationshipTypes.Friends.ToString(),
-                                            Constants.PORTAL_Zero,
-                                            Constants.USER_ValidId,
-                                            RelationshipStatus.None);
-            }
-
-            mockDataService.Setup(md => md.GetRelationshipsByUserId(Constants.USER_ValidId)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationships = relationshipController.GetRelationshipsByUserId(Constants.USER_ValidId);
-
-            // Assert
-            Assert.IsInstanceOf<IList<Relationship>>(relationships);
-            Assert.AreEqual(5, relationships.Count);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipsByUserID_Returns_EmptyList_Of_Relationships_For_InValid_User()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            mockDataService.Setup(md => md.GetRelationshipsByUserId(Constants.USER_InValidId)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var relationships = relationshipController.GetRelationshipsByUserId(Constants.USER_InValidId);
-
-            // Assert
-            Assert.IsInstanceOf<IList<Relationship>>(relationships);
-            Assert.AreEqual(0, relationships.Count);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipsByPortalID_Returns_List_Of_Relationships_For_Valid_Portal()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            for (int i = 1; i <= 5; i++)
-            {
-                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
-                                            DefaultRelationshipTypes.Friends.ToString(),
-                                            Constants.PORTAL_Zero,
-                                            Constants.USER_Null,
-                                            RelationshipStatus.None);
-            }
-
-            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Zero)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            // Act
-            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Zero);
-
-            // Assert
-            Assert.IsInstanceOf<IList<Relationship>>(relationships);
-            Assert.AreEqual(5, relationships.Count);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipsByPortalID_Returns_List_Of_Relationships_For_Valid_Portal_When_Portal_Is_In_Group()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            for (int i = 1; i <= 5; i++)
-            {
-                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
-                                            DefaultRelationshipTypes.Friends.ToString(),
-                                            Constants.PORTAL_Zero,
-                                            Constants.USER_Null,
-                                            RelationshipStatus.None);
-            }
-
-            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Zero)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
-
-            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
-            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
-
-            // Act
-            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Zero);
-
-            // Assert
-            Assert.IsInstanceOf<IList<Relationship>>(relationships);
-            Assert.AreEqual(5, relationships.Count);
-        }
-
-        [Test]
-        public void RelationshipController_GetRelationshipsByPortalID_Returns_EmptyList_Of_Relationships_For_InValid_Portal()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtRelationships.Clear();
-            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Null)).Returns(this.dtRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Null, Null.NullInteger);
-            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Null)).Returns(mockPortalInfo);
-
-            // Act
-            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Null);
-
-            // Assert
-            Assert.IsInstanceOf<IList<Relationship>>(relationships);
-            Assert.AreEqual(0, relationships.Count);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_SaveRelationship_Throws_On_Null_Relationship()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.SaveRelationship(null);
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationship_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var relationship = new Relationship
-            {
-                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
-            };
-
-            // Act
-            relationshipController.SaveRelationship(relationship);
-
-            // Assert
-            mockDataService.Verify(d => d.SaveRelationship(relationship, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationship_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var relationship = new Relationship
-            {
-                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
-                Name = Constants.SOCIAL_RelationshipName,
-            };
-
-            // Act
-            relationshipController.SaveRelationship(relationship);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_Relationship_Updated, Constants.SOCIAL_RelationshipName);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        public void RelationshipController_SaveRelationship_Calls_DataCache_RemoveCache()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
-            var relationshipType = new RelationshipType()
-            {
-                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
-            };
-
-            // Act
-            relationshipController.SaveRelationshipType(relationshipType);
-
-            // Assert
-            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_DeleteUserRelationship_Throws_On_Null_UserRelationship()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.DeleteUserRelationship(null);
-        }
-
-        [Test]
-        public void RelationshipController_DeleteUserRelationship_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var userRelationship = new UserRelationship()
-            {
-                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
-            };
-
-            // Act
-            relationshipController.DeleteUserRelationship(userRelationship);
-
-            // Assert
-            mockDataService.Verify(d => d.DeleteUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteUserRelationship_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var userRelationship = new UserRelationship
-            {
-                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
-                UserId = Constants.USER_ElevenId,
-                RelatedUserId = Constants.USER_TenId,
-            };
-
-            // Act
-            relationshipController.DeleteUserRelationship(userRelationship);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_UserRelationship_Deleted, Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_ElevenId, Constants.USER_TenId);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        [TestCase(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId)]
-        [TestCase(Constants.SOCIAL_UserRelationshipIDUser12User13, 12, 13)]
-        public void RelationshipController_GetUserRelationship_Returns_Relationship_For_Valid_ID(int userRelationshipId, int userId, int relatedUserId)
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtUserRelationships.Clear();
-            this.dtUserRelationships.Rows.Add(userRelationshipId, userId, relatedUserId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
-            mockDataService.Setup(md => md.GetUserRelationship(userRelationshipId)).Returns(this.dtUserRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.GetUserRelationship(userRelationshipId);
-
-            // Assert
-            Assert.AreEqual(userRelationshipId, userRelationship.UserRelationshipId);
-        }
-
-        [Test]
-        public void RelationshipController_GetUserRelationship_Returns_Null_For_InValid_ID()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtUserRelationships.Clear();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.GetUserRelationship(Constants.SOCIAL_InValidUserRelationship);
-
-            // Assert
-            Assert.IsNull(userRelationship);
-        }
-
-        [Test]
-        public void RelationshipController_GetUserRelationships_Returns_List_Of_UserRelationships_For_Valid_User()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtUserRelationships.Clear();
-            for (int i = 1; i <= 5; i++)
-            {
-                this.dtUserRelationships.Rows.Add(i, Constants.USER_ValidId, Constants.USER_TenId,
-                                                Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
-            }
-
-            mockDataService.Setup(md => md.GetUserRelationships(Constants.USER_ValidId)).Returns(this.dtUserRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var user = new UserInfo { UserID = Constants.USER_ValidId };
-            var userRelationships = relationshipController.GetUserRelationships(user);
-
-            // Assert
-            Assert.IsInstanceOf<IList<UserRelationship>>(userRelationships);
-            Assert.AreEqual(5, userRelationships.Count);
-        }
-
-        [Test]
-        public void RelationshipController_GetUserRelationships_Returns_EmptyList_Of_UserRelationships_For_InValid_User()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            this.dtUserRelationships.Clear();
-
-            mockDataService.Setup(md => md.GetUserRelationships(Constants.USER_InValidId)).Returns(this.dtUserRelationships.CreateDataReader());
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var user = new UserInfo { UserID = Constants.USER_InValidId };
-            var userRelationships = relationshipController.GetUserRelationships(user);
-
-            // Assert
-            Assert.IsInstanceOf<IList<UserRelationship>>(userRelationships);
-            Assert.AreEqual(0, userRelationships.Count);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_SaveUserRelationship_Throws_On_Null_UserRelationship()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.SaveUserRelationship(null);
-        }
-
-        [Test]
-        public void RelationshipController_SaveUserRelationship_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var userRelationship = new UserRelationship()
-            {
-                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
-            };
-
-            // Act
-            relationshipController.SaveUserRelationship(userRelationship);
-
-            // Assert
-            mockDataService.Verify(d => d.SaveUserRelationship(userRelationship, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void RelationshipController_SaveUserRelationship_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()))
-                                .Returns(Constants.SOCIAL_UserRelationshipIDUser10User11);
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
-            var userRelationship = new UserRelationship
-            {
-                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
-                UserId = Constants.USER_ElevenId,
-                RelatedUserId = Constants.USER_TenId,
-            };
-
-            // Act
-            relationshipController.SaveUserRelationship(userRelationship);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_UserRelationship_Updated, Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_ElevenId, Constants.USER_TenId);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_DeleteUserRelationshipPreference_Throws_On_Null_UserRelationshipPreference()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.DeleteUserRelationshipPreference(null);
-        }
-
-        [Test]
-        public void RelationshipController_DeleteUserRelationshipPreference_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var preference = new UserRelationshipPreference()
-            {
-                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
-            };
-
-            // Act
-            relationshipController.DeleteUserRelationshipPreference(preference);
-
-            // Assert
-            mockDataService.Verify(d => d.DeleteUserRelationshipPreference(Constants.SOCIAL_PrefereceIDForUser11));
-        }
-
-        [Test]
-        public void RelationshipController_DeleteUserRelationshipPreference_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = this.CreateRelationshipController(mockEventLogController);
-            var preference = new UserRelationshipPreference()
-            {
-                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
-                UserId = Constants.USER_ElevenId,
-                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
-            };
-
-            // Act
-            relationshipController.DeleteUserRelationshipPreference(preference);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_UserRelationshipPreference_Deleted, Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        public void RelationshipController_GetUserRelationshipPreference_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetUserRelationshipPreferenceById(It.IsAny<int>()))
-                            .Returns(this.dtUserRelationshipPreferences.CreateDataReader);
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var preference = relationshipController.GetUserRelationshipPreference(Constants.SOCIAL_PrefereceIDForUser11);
-
-            // Assert
-            mockDataService.Verify(d => d.GetUserRelationshipPreferenceById(Constants.SOCIAL_PrefereceIDForUser11));
-        }
-
-        [Test]
-        public void RelationshipController_GetUserRelationshipPreference_Overload_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>()))
-                            .Returns(this.dtUserRelationshipPreferences.CreateDataReader);
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var preference = relationshipController.GetUserRelationshipPreference(Constants.USER_ValidId, Constants.SOCIAL_FriendRelationshipID);
-
-            // Assert
-            mockDataService.Verify(d => d.GetUserRelationshipPreference(Constants.USER_ValidId, Constants.SOCIAL_FriendRelationshipID));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RelationshipController_SaveUserRelationshipPreference_Throws_On_Null_UserRelationshipPreference()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-
-            // Act, Assert
-            relationshipController.SaveUserRelationshipPreference(null);
-        }
-
-        [Test]
-        public void RelationshipController_SaveUserRelationshipPreference_Calls_DataService()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-            var preference = new UserRelationshipPreference()
-            {
-                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
-                UserId = Constants.USER_ElevenId,
-                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
-            };
-
-            // Act
-            relationshipController.SaveUserRelationshipPreference(preference);
-
-            // Assert
-            mockDataService.Verify(d => d.SaveUserRelationshipPreference(preference, It.IsAny<int>()));
-        }
-
-        [Test]
-        public void RelationshipController_SaveUserRelationshipPreference_Calls_EventLogController_AddLog()
-        {
-            // Arrange
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(ds => ds.SaveUserRelationshipPreference(It.IsAny<UserRelationshipPreference>(), It.IsAny<int>()))
-                                .Returns(Constants.SOCIAL_PrefereceIDForUser11);
-            var mockEventLogController = new Mock<IEventLogController>();
-            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
-            this.CreateLocalizationProvider();
-
-            var relationshipController = new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
-            var preference = new UserRelationshipPreference()
-            {
-                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
-                UserId = Constants.USER_ElevenId,
-                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
-            };
-
-            // Act
-            relationshipController.SaveUserRelationshipPreference(preference);
-
-            // Assert
-            var logContent = string.Format(Constants.LOCALIZATION_UserRelationshipPreference_Updated, Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID);
-            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void RelationshipController_InitiateUserRelationship_Throws_On_Negative_RelationshipID()
-        {
-            // Arrange
-            var relationshipController = this.CreateRelationshipController();
-            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
-            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
-            var relationship = new Relationship();
-
-            // Act, Assert
-            relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
-        }
-
-        [Test]
-        public void RelationshipController_InitiateUserRelationship_Returns_Status_Accepted_When_Default_Relationship_Action_Is_Accepted()
-        {
-            // Arrange
-            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
-            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
-            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
-
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Clear();
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
-            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
-
-            // Assert
-            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Accepted);
-        }
-
-        [Test]
-        public void RelationshipController_InitiateUserRelationship_Returns_Status_Initiated_When_Default_Relationship_Action_Is_None()
-        {
-            // Arrange
-            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
-            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
-            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.None };
-
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Clear();
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
-            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
-
-            // Assert
-            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Pending);
-        }
-
-        [Test]
-        public void RelationshipController_InitiateUserRelationship_Returns_Status_Accepted_When_TargetUsers_Relationship_Action_Is_Accepted()
-        {
-            // Arrange
-            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
-            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
-            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
-
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Add(Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_TenId, Constants.USER_ElevenId, RelationshipStatus.Accepted);
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
-            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
-
-            // Assert
-            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Accepted);
-        }
-
-        [Test]
-        public void RelationshipController_InitiateUserRelationship_Returns_Status_Initiated_When_TargetUsers_Relationship_Action_Is_None()
-        {
-            // Arrange
-            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
-            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
-            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
-
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Clear();
-            this.dtUserRelationshipPreferences.Rows.Add(Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_TenId, Constants.USER_ElevenId, RelationshipStatus.None);
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
-            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
-
-            // Assert
-            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Pending);
-        }
-
-        [Test]
-        [ExpectedException(typeof(UserRelationshipDoesNotExistException))]
-        public void RelationshipController_RemoveUserRelationship_Throws_On_NonExistent_Relationship()
-        {
-            // Arrange
-
-            // No UserRelationship between user10 and user11
-            this.dtUserRelationships.Rows.Clear();
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act, Assert
-            relationshipController.RemoveUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
-        }
-
-        [Test]
-        [ExpectedException(typeof(UserRelationshipDoesNotExistException))]
-        public void RelationshipController_AcceptRelationship_Throws_On_NonExistent_Relationship()
-        {
-            // Arrange
-
-            // No UserRelationship between user10 and user11
-            this.dtUserRelationships.Rows.Clear();
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act, Assert
-            relationshipController.AcceptUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
-        }
-
-        [Test]
-        public void RelationshipController_AcceptUserRelationship_Calls_DataService_On_Valid_RelationshipID()
-        {
-            // Arrange
-
-            // Any UserRelationship between user10 and user11
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationships.Rows.Add(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()));
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            relationshipController.AcceptUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
-
-            // Assert
-            mockDataService.Verify(ds => ds.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()));
-        }
-
-        [Test]
-        public void RelationshipController_RemoveUserRelationship_Calls_DataService_On_Valid_RelationshipID()
-        {
-            // Arrange
-
-            // Any UserRelationship between user10 and user11
-            this.dtUserRelationships.Rows.Clear();
-            this.dtUserRelationships.Rows.Add(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
-
-            // setup mock DataService
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
-            mockDataService.Setup(md => md.DeleteUserRelationship(It.IsAny<int>()));
-
-            var relationshipController = this.CreateRelationshipController(mockDataService);
-
-            // Act
-            relationshipController.RemoveUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
-
-            // Assert
-            mockDataService.Verify(ds => ds.DeleteUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11));
-        }
-
-        private static PortalInfo CreatePortalInfo(int portalId, int portalGroupId)
-        {
-            var mockPortalInfo = new PortalInfo { PortalID = portalId, PortalGroupID = portalGroupId };
-            return mockPortalInfo;
-        }
-
-        private static PortalGroupInfo CreatePortalGroupInfo(int portalGroupId, int masterPortalId)
-        {
-            var mockPortalGroupInfo = new PortalGroupInfo
-            {
-                PortalGroupId = portalGroupId,
-                MasterPortalId = masterPortalId,
-                PortalGroupName = Constants.PORTALGROUP_ValidName,
-                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
-            };
-
-            return mockPortalGroupInfo;
-        }
-
-        private Mock<IDataService> CreateMockDataServiceWithRelationshipTypes()
-        {
-            var mockDataService = new Mock<IDataService>();
-            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
-            mockDataService.Setup(md => md.GetRelationshipsByPortalId(It.IsAny<int>())).Returns(this.dtRelationships.CreateDataReader());
-            return mockDataService;
-        }
-
-        private void CreateLocalizationProvider()
-        {
-            var mockProvider = MockComponentProvider.CreateLocalizationProvider();
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_RelationshipType_Deleted_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_RelationshipType_Deleted);
-
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_RelationshipType_Updated_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_RelationshipType_Updated);
-
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_Relationship_Deleted_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_Relationship_Deleted);
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_Relationship_Updated_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_Relationship_Updated);
-
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationshipPreference_Deleted_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_UserRelationshipPreference_Deleted);
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationshipPreference_Updated_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_UserRelationshipPreference_Updated);
-
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Deleted_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_UserRelationship_Deleted);
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Added_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_UserRelationship_Added);
-            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Updated_Key, It.IsAny<string>()))
-                        .Returns(Constants.LOCALIZATION_UserRelationship_Updated);
-        }
-
-        private RelationshipControllerImpl CreateRelationshipController()
-        {
-            var mockDataService = new Mock<IDataService>();
-            return this.CreateRelationshipController(mockDataService);
-        }
-
-        private RelationshipControllerImpl CreateRelationshipController(Mock<IDataService> mockDataService)
-        {
-            var mockEventLogController = new Mock<IEventLogController>();
-            return new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
-        }
-
-        private RelationshipControllerImpl CreateRelationshipController(Mock<IEventLogController> mockEventLogController)
-        {
-            var mockDataService = new Mock<IDataService>();
-            return new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
-        }
-
-        private void SetupDataTables()
-        {
-            // RelationshipTypes
-            this.dtRelationshipTypes = new DataTable("RelationshipTypes");
-            var pkRelationshipTypeID = this.dtRelationshipTypes.Columns.Add("RelationshipTypeID", typeof(int));
-            this.dtRelationshipTypes.Columns.Add("Name", typeof(string));
-            this.dtRelationshipTypes.Columns.Add("Description", typeof(string));
-            this.dtRelationshipTypes.Columns.Add("Direction", typeof(int));
-            this.dtRelationshipTypes.Columns.Add("CreatedByUserID", typeof(int));
-            this.dtRelationshipTypes.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this.dtRelationshipTypes.Columns.Add("LastModifiedByUserID", typeof(int));
-            this.dtRelationshipTypes.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-
-            this.dtRelationshipTypes.PrimaryKey = new[] { pkRelationshipTypeID };
-
-            this.dtRelationshipTypes.Rows.Add(DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(), DefaultRelationshipTypes.Friends.ToString(), RelationshipDirection.TwoWay);
-            this.dtRelationshipTypes.Rows.Add(DefaultRelationshipTypes.Followers, DefaultRelationshipTypes.Followers.ToString(), DefaultRelationshipTypes.Followers.ToString(), RelationshipDirection.OneWay);
-
-            // Relationships
-            this.dtRelationships = new DataTable("Relationships");
-            var pkRelationshipID = this.dtRelationships.Columns.Add("RelationshipID", typeof(int));
-            this.dtRelationships.Columns.Add("RelationshipTypeID", typeof(int));
-            this.dtRelationships.Columns.Add("Name", typeof(string));
-            this.dtRelationships.Columns.Add("Description", typeof(string));
-            this.dtRelationships.Columns.Add("PortalID", typeof(int));
-            this.dtRelationships.Columns.Add("UserID", typeof(int));
-            this.dtRelationships.Columns.Add("DefaultResponse", typeof(int));
-            this.dtRelationships.Columns.Add("CreatedByUserID", typeof(int));
-            this.dtRelationships.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this.dtRelationships.Columns.Add("LastModifiedByUserID", typeof(int));
-            this.dtRelationships.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-            this.dtRelationships.PrimaryKey = new[] { pkRelationshipID };
-
-            // Create default Friend and Social Relationships
-            this.dtRelationships.Rows.Add(Constants.SOCIAL_FriendRelationshipID, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(), DefaultRelationshipTypes.Friends.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
-            this.dtRelationships.Rows.Add(Constants.SOCIAL_FollowerRelationshipID, DefaultRelationshipTypes.Followers, DefaultRelationshipTypes.Followers.ToString(), DefaultRelationshipTypes.Followers.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
-
-            // UserRelationships
-            this.dtUserRelationships = new DataTable("UserRelationships");
-            var pkUserRelationshipID = this.dtUserRelationships.Columns.Add("UserRelationshipID", typeof(int));
-            this.dtUserRelationships.Columns.Add("UserID", typeof(int));
-            this.dtUserRelationships.Columns.Add("RelatedUserID", typeof(int));
-            this.dtUserRelationships.Columns.Add("RelationshipID", typeof(int));
-            this.dtUserRelationships.Columns.Add("Status", typeof(int));
-            this.dtUserRelationships.Columns.Add("CreatedByUserID", typeof(int));
-            this.dtUserRelationships.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this.dtUserRelationships.Columns.Add("LastModifiedByUserID", typeof(int));
-            this.dtUserRelationships.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-            this.dtUserRelationships.PrimaryKey = new[] { pkUserRelationshipID };
-
-            // UserRelationshipPreferences
-            this.dtUserRelationshipPreferences = new DataTable("UserRelationshipPreferences");
-            var pkPreferenceID = this.dtUserRelationshipPreferences.Columns.Add("PreferenceID", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("UserID", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("RelationshipID", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("DefaultResponse", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("CreatedByUserID", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("CreatedOnDate", typeof(DateTime));
-            this.dtUserRelationshipPreferences.Columns.Add("LastModifiedByUserID", typeof(int));
-            this.dtUserRelationshipPreferences.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-            this.dtUserRelationshipPreferences.PrimaryKey = new[] { pkPreferenceID };
-        }
-    }
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            ComponentFactory.Container = new SimpleContainer();
+            var mockDataProvider = MockComponentProvider.CreateDataProvider();
+            mockDataProvider.Setup(dp => dp.GetProviderPath()).Returns(string.Empty);
+
+            this.mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
+            MockComponentProvider.CreateEventLogController();
+
+            this._portalController = new Mock<IPortalController>();
+            PortalController.SetTestableInstance(this._portalController.Object);
+
+            this._portalGroupController = new Mock<IPortalGroupController>();
+            PortalGroupController.RegisterInstance(this._portalGroupController.Object);
+
+            var mockHostController = new Mock<IHostController>();
+            mockHostController.Setup(c => c.GetString("PerformanceSetting")).Returns("0");
+            HostController.RegisterInstance(mockHostController.Object);
+
+            var mockUserController = new Mock<IUserController>();
+            mockUserController.Setup(c => c.GetCurrentUserInfo()).Returns(new UserInfo() { UserID = 1 });
+            UserController.SetTestableInstance(mockUserController.Object);
+
+            this.CreateLocalizationProvider();
+
+            this.SetupDataTables();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            ComponentFactory.Container = null;
+            PortalController.ClearInstance();
+            UserController.ClearInstance();
+        }
+
+        [Test]
+        public void RelationshipController_Constructor_Throws_On_Null_DataService()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => new RelationshipControllerImpl(null, mockEventLogController.Object));
+        }
+
+        [Test]
+        public void RelationshipController_Constructor_Throws_On_Null_EventLogController()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+
+            // Act, Assert
+            Assert.Throws<ArgumentNullException>(() => new RelationshipControllerImpl(mockDataService.Object, null));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_DeleteRelationshipType_Throws_On_Null_RelationshipType()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.DeleteRelationshipType(null);
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationshipType_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+            };
+
+            // Act
+            relationshipController.DeleteRelationshipType(relationshipType);
+
+            // Assert
+            mockDataService.Verify(d => d.DeleteRelationshipType(Constants.SOCIAL_FollowerRelationshipTypeID));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationshipType_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+                Name = Constants.SOCIAL_RelationshipTypeName,
+            };
+
+            // Act
+            relationshipController.DeleteRelationshipType(relationshipType);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_RelationshipType_Deleted, Constants.SOCIAL_RelationshipTypeName, Constants.SOCIAL_FollowerRelationshipTypeID);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationshipType_Calls_DataCache_RemoveCache()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+            };
+
+            // Act
+            relationshipController.DeleteRelationshipType(relationshipType);
+
+            // Assert
+            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
+        }
+
+        [Test]
+        public void RelationshipController_GetAllRelationshipTypes_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationshipTypes = relationshipController.GetAllRelationshipTypes();
+
+            // Assert
+            mockDataService.Verify(d => d.GetAllRelationshipTypes());
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipType_Calls_DataService_If_Not_Cached()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationshipTypes = relationshipController.GetRelationshipType(Constants.SOCIAL_FriendRelationshipTypeID);
+
+            // Assert
+            mockDataService.Verify(d => d.GetAllRelationshipTypes());
+        }
+
+        [Test]
+        [TestCase(Constants.SOCIAL_FriendRelationshipTypeID)]
+        [TestCase(Constants.SOCIAL_FollowerRelationshipTypeID)]
+        public void RelationshipController_GetRelationshipType_Returns_RelationshipType_For_Valid_ID(int relationshipTypeId)
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationshipType = relationshipController.GetRelationshipType(relationshipTypeId);
+
+            // Assert
+            Assert.AreEqual(relationshipTypeId, relationshipType.RelationshipTypeId);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipType_Returns_Null_For_InValid_ID()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationshipType = relationshipController.GetRelationshipType(Constants.SOCIAL_InValidRelationshipType);
+
+            // Assert
+            Assert.IsNull(relationshipType);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_SaveRelationshipType_Throws_On_Null_RelationshipType()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.SaveRelationshipType(null);
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationshipType_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+            };
+
+            // Act
+            relationshipController.SaveRelationshipType(relationshipType);
+
+            // Assert
+            mockDataService.Verify(d => d.SaveRelationshipType(relationshipType, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationshipType_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+                Name = Constants.SOCIAL_RelationshipTypeName,
+            };
+
+            // Act
+            relationshipController.SaveRelationshipType(relationshipType);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_RelationshipType_Updated, Constants.SOCIAL_RelationshipTypeName);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationshipType_Calls_DataCache_RemoveCache()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+            };
+
+            // Act
+            relationshipController.SaveRelationshipType(relationshipType);
+
+            // Assert
+            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_DeleteRelationship_Throws_On_Null_Relationship()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.DeleteRelationship(null);
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationship_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var relationship = new Relationship()
+            {
+                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
+            };
+
+            // Act
+            relationshipController.DeleteRelationship(relationship);
+
+            // Assert
+            mockDataService.Verify(d => d.DeleteRelationship(Constants.SOCIAL_FollowerRelationshipID));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationship_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var relationship = new Relationship()
+            {
+                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
+                Name = Constants.SOCIAL_RelationshipName,
+            };
+
+            // Act
+            relationshipController.DeleteRelationship(relationship);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_Relationship_Deleted, Constants.SOCIAL_RelationshipName, Constants.SOCIAL_FollowerRelationshipID);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteRelationship_Calls_DataCache_RemoveCache()
+        {
+            // Arrange
+            var portalId = 1;
+            var relationshipController = this.CreateRelationshipController();
+            var cacheKey = CachingProvider.GetCacheKey(string.Format(DataCache.RelationshipByPortalIDCacheKey, portalId));
+            var relationship = new Relationship()
+            {
+                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
+                PortalId = portalId,
+                UserId = -1,
+            };
+
+            // Act
+            relationshipController.DeleteRelationship(relationship);
+
+            // Assert
+            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
+        }
+
+        [Test]
+        [TestCase(Constants.SOCIAL_FriendRelationshipID, DefaultRelationshipTypes.Friends)]
+        [TestCase(Constants.SOCIAL_FollowerRelationshipID, DefaultRelationshipTypes.Followers)]
+        public void RelationshipController_GetRelationship_Returns_Relationship_For_Valid_ID(int relationshipId, DefaultRelationshipTypes defaultType)
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            this.dtRelationships.Rows.Add(relationshipId, defaultType, defaultType.ToString(), defaultType.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
+            mockDataService.Setup(md => md.GetRelationship(relationshipId)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationship = relationshipController.GetRelationship(relationshipId);
+
+            // Assert
+            Assert.AreEqual(relationshipId, relationship.RelationshipId);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationship_Returns_Null_For_InValid_ID()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            mockDataService.Setup(md => md.GetRelationship(It.IsAny<int>())).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationship = relationshipController.GetRelationship(Constants.SOCIAL_InValidRelationship);
+
+            // Assert
+            Assert.IsNull(relationship);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipsByUserID_Returns_List_Of_Relationships_For_Valid_User()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            for (int i = 1; i <= 5; i++)
+            {
+                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
+                                            DefaultRelationshipTypes.Friends.ToString(),
+                                            Constants.PORTAL_Zero,
+                                            Constants.USER_ValidId,
+                                            RelationshipStatus.None);
+            }
+
+            mockDataService.Setup(md => md.GetRelationshipsByUserId(Constants.USER_ValidId)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationships = relationshipController.GetRelationshipsByUserId(Constants.USER_ValidId);
+
+            // Assert
+            Assert.IsInstanceOf<IList<Relationship>>(relationships);
+            Assert.AreEqual(5, relationships.Count);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipsByUserID_Returns_EmptyList_Of_Relationships_For_InValid_User()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            mockDataService.Setup(md => md.GetRelationshipsByUserId(Constants.USER_InValidId)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var relationships = relationshipController.GetRelationshipsByUserId(Constants.USER_InValidId);
+
+            // Assert
+            Assert.IsInstanceOf<IList<Relationship>>(relationships);
+            Assert.AreEqual(0, relationships.Count);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipsByPortalID_Returns_List_Of_Relationships_For_Valid_Portal()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            for (int i = 1; i <= 5; i++)
+            {
+                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
+                                            DefaultRelationshipTypes.Friends.ToString(),
+                                            Constants.PORTAL_Zero,
+                                            Constants.USER_Null,
+                                            RelationshipStatus.None);
+            }
+
+            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Zero)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            // Act
+            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Zero);
+
+            // Assert
+            Assert.IsInstanceOf<IList<Relationship>>(relationships);
+            Assert.AreEqual(5, relationships.Count);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipsByPortalID_Returns_List_Of_Relationships_For_Valid_Portal_When_Portal_Is_In_Group()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            for (int i = 1; i <= 5; i++)
+            {
+                this.dtRelationships.Rows.Add(i, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(),
+                                            DefaultRelationshipTypes.Friends.ToString(),
+                                            Constants.PORTAL_Zero,
+                                            Constants.USER_Null,
+                                            RelationshipStatus.None);
+            }
+
+            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Zero)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Zero, Constants.PORTALGROUP_ValidPortalGroupId);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Zero)).Returns(mockPortalInfo);
+
+            List<PortalGroupInfo> portalGroups = new List<PortalGroupInfo>() { CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero) }; // CreatePortalGroupInfo(Constants.PORTALGROUP_ValidPortalGroupId, Constants.PORTAL_Zero);
+            this._portalGroupController.Setup(pgc => pgc.GetPortalGroups()).Returns(portalGroups);
+
+            // Act
+            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Zero);
+
+            // Assert
+            Assert.IsInstanceOf<IList<Relationship>>(relationships);
+            Assert.AreEqual(5, relationships.Count);
+        }
+
+        [Test]
+        public void RelationshipController_GetRelationshipsByPortalID_Returns_EmptyList_Of_Relationships_For_InValid_Portal()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtRelationships.Clear();
+            mockDataService.Setup(md => md.GetRelationshipsByPortalId(Constants.PORTAL_Null)).Returns(this.dtRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            var mockPortalInfo = CreatePortalInfo(Constants.PORTAL_Null, Null.NullInteger);
+            this._portalController.Setup(pc => pc.GetPortal(Constants.PORTAL_Null)).Returns(mockPortalInfo);
+
+            // Act
+            var relationships = relationshipController.GetRelationshipsByPortalId(Constants.PORTAL_Null);
+
+            // Assert
+            Assert.IsInstanceOf<IList<Relationship>>(relationships);
+            Assert.AreEqual(0, relationships.Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_SaveRelationship_Throws_On_Null_Relationship()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.SaveRelationship(null);
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationship_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var relationship = new Relationship
+            {
+                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
+            };
+
+            // Act
+            relationshipController.SaveRelationship(relationship);
+
+            // Assert
+            mockDataService.Verify(d => d.SaveRelationship(relationship, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationship_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var relationship = new Relationship
+            {
+                RelationshipId = Constants.SOCIAL_FollowerRelationshipID,
+                Name = Constants.SOCIAL_RelationshipName,
+            };
+
+            // Act
+            relationshipController.SaveRelationship(relationship);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_Relationship_Updated, Constants.SOCIAL_RelationshipName);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        public void RelationshipController_SaveRelationship_Calls_DataCache_RemoveCache()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+            var cacheKey = CachingProvider.GetCacheKey(DataCache.RelationshipTypesCacheKey);
+            var relationshipType = new RelationshipType()
+            {
+                RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID,
+            };
+
+            // Act
+            relationshipController.SaveRelationshipType(relationshipType);
+
+            // Assert
+            this.mockCachingProvider.Verify(e => e.Remove(cacheKey));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_DeleteUserRelationship_Throws_On_Null_UserRelationship()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.DeleteUserRelationship(null);
+        }
+
+        [Test]
+        public void RelationshipController_DeleteUserRelationship_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = this.CreateMockDataServiceWithRelationshipTypes();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var userRelationship = new UserRelationship()
+            {
+                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
+            };
+
+            // Act
+            relationshipController.DeleteUserRelationship(userRelationship);
+
+            // Assert
+            mockDataService.Verify(d => d.DeleteUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteUserRelationship_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var userRelationship = new UserRelationship
+            {
+                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
+                UserId = Constants.USER_ElevenId,
+                RelatedUserId = Constants.USER_TenId,
+            };
+
+            // Act
+            relationshipController.DeleteUserRelationship(userRelationship);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_UserRelationship_Deleted, Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_ElevenId, Constants.USER_TenId);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        [TestCase(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId)]
+        [TestCase(Constants.SOCIAL_UserRelationshipIDUser12User13, 12, 13)]
+        public void RelationshipController_GetUserRelationship_Returns_Relationship_For_Valid_ID(int userRelationshipId, int userId, int relatedUserId)
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtUserRelationships.Clear();
+            this.dtUserRelationships.Rows.Add(userRelationshipId, userId, relatedUserId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
+            mockDataService.Setup(md => md.GetUserRelationship(userRelationshipId)).Returns(this.dtUserRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.GetUserRelationship(userRelationshipId);
+
+            // Assert
+            Assert.AreEqual(userRelationshipId, userRelationship.UserRelationshipId);
+        }
+
+        [Test]
+        public void RelationshipController_GetUserRelationship_Returns_Null_For_InValid_ID()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtUserRelationships.Clear();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.GetUserRelationship(Constants.SOCIAL_InValidUserRelationship);
+
+            // Assert
+            Assert.IsNull(userRelationship);
+        }
+
+        [Test]
+        public void RelationshipController_GetUserRelationships_Returns_List_Of_UserRelationships_For_Valid_User()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtUserRelationships.Clear();
+            for (int i = 1; i <= 5; i++)
+            {
+                this.dtUserRelationships.Rows.Add(i, Constants.USER_ValidId, Constants.USER_TenId,
+                                                Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
+            }
+
+            mockDataService.Setup(md => md.GetUserRelationships(Constants.USER_ValidId)).Returns(this.dtUserRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var user = new UserInfo { UserID = Constants.USER_ValidId };
+            var userRelationships = relationshipController.GetUserRelationships(user);
+
+            // Assert
+            Assert.IsInstanceOf<IList<UserRelationship>>(userRelationships);
+            Assert.AreEqual(5, userRelationships.Count);
+        }
+
+        [Test]
+        public void RelationshipController_GetUserRelationships_Returns_EmptyList_Of_UserRelationships_For_InValid_User()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            this.dtUserRelationships.Clear();
+
+            mockDataService.Setup(md => md.GetUserRelationships(Constants.USER_InValidId)).Returns(this.dtUserRelationships.CreateDataReader());
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var user = new UserInfo { UserID = Constants.USER_InValidId };
+            var userRelationships = relationshipController.GetUserRelationships(user);
+
+            // Assert
+            Assert.IsInstanceOf<IList<UserRelationship>>(userRelationships);
+            Assert.AreEqual(0, userRelationships.Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_SaveUserRelationship_Throws_On_Null_UserRelationship()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.SaveUserRelationship(null);
+        }
+
+        [Test]
+        public void RelationshipController_SaveUserRelationship_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var userRelationship = new UserRelationship()
+            {
+                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
+            };
+
+            // Act
+            relationshipController.SaveUserRelationship(userRelationship);
+
+            // Assert
+            mockDataService.Verify(d => d.SaveUserRelationship(userRelationship, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void RelationshipController_SaveUserRelationship_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()))
+                                .Returns(Constants.SOCIAL_UserRelationshipIDUser10User11);
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
+            var userRelationship = new UserRelationship
+            {
+                UserRelationshipId = Constants.SOCIAL_UserRelationshipIDUser10User11,
+                UserId = Constants.USER_ElevenId,
+                RelatedUserId = Constants.USER_TenId,
+            };
+
+            // Act
+            relationshipController.SaveUserRelationship(userRelationship);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_UserRelationship_Updated, Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_ElevenId, Constants.USER_TenId);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_DeleteUserRelationshipPreference_Throws_On_Null_UserRelationshipPreference()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.DeleteUserRelationshipPreference(null);
+        }
+
+        [Test]
+        public void RelationshipController_DeleteUserRelationshipPreference_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var preference = new UserRelationshipPreference()
+            {
+                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
+            };
+
+            // Act
+            relationshipController.DeleteUserRelationshipPreference(preference);
+
+            // Assert
+            mockDataService.Verify(d => d.DeleteUserRelationshipPreference(Constants.SOCIAL_PrefereceIDForUser11));
+        }
+
+        [Test]
+        public void RelationshipController_DeleteUserRelationshipPreference_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = this.CreateRelationshipController(mockEventLogController);
+            var preference = new UserRelationshipPreference()
+            {
+                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
+                UserId = Constants.USER_ElevenId,
+                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
+            };
+
+            // Act
+            relationshipController.DeleteUserRelationshipPreference(preference);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_UserRelationshipPreference_Deleted, Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        public void RelationshipController_GetUserRelationshipPreference_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetUserRelationshipPreferenceById(It.IsAny<int>()))
+                            .Returns(this.dtUserRelationshipPreferences.CreateDataReader);
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var preference = relationshipController.GetUserRelationshipPreference(Constants.SOCIAL_PrefereceIDForUser11);
+
+            // Assert
+            mockDataService.Verify(d => d.GetUserRelationshipPreferenceById(Constants.SOCIAL_PrefereceIDForUser11));
+        }
+
+        [Test]
+        public void RelationshipController_GetUserRelationshipPreference_Overload_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>()))
+                            .Returns(this.dtUserRelationshipPreferences.CreateDataReader);
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var preference = relationshipController.GetUserRelationshipPreference(Constants.USER_ValidId, Constants.SOCIAL_FriendRelationshipID);
+
+            // Assert
+            mockDataService.Verify(d => d.GetUserRelationshipPreference(Constants.USER_ValidId, Constants.SOCIAL_FriendRelationshipID));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RelationshipController_SaveUserRelationshipPreference_Throws_On_Null_UserRelationshipPreference()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+
+            // Act, Assert
+            relationshipController.SaveUserRelationshipPreference(null);
+        }
+
+        [Test]
+        public void RelationshipController_SaveUserRelationshipPreference_Calls_DataService()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+            var preference = new UserRelationshipPreference()
+            {
+                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
+                UserId = Constants.USER_ElevenId,
+                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
+            };
+
+            // Act
+            relationshipController.SaveUserRelationshipPreference(preference);
+
+            // Assert
+            mockDataService.Verify(d => d.SaveUserRelationshipPreference(preference, It.IsAny<int>()));
+        }
+
+        [Test]
+        public void RelationshipController_SaveUserRelationshipPreference_Calls_EventLogController_AddLog()
+        {
+            // Arrange
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(ds => ds.SaveUserRelationshipPreference(It.IsAny<UserRelationshipPreference>(), It.IsAny<int>()))
+                                .Returns(Constants.SOCIAL_PrefereceIDForUser11);
+            var mockEventLogController = new Mock<IEventLogController>();
+            mockEventLogController.Setup(c => c.AddLog(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<EventLogController.EventLogType>()));
+            this.CreateLocalizationProvider();
+
+            var relationshipController = new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
+            var preference = new UserRelationshipPreference()
+            {
+                PreferenceId = Constants.SOCIAL_PrefereceIDForUser11,
+                UserId = Constants.USER_ElevenId,
+                RelationshipId = Constants.SOCIAL_FriendRelationshipID,
+            };
+
+            // Act
+            relationshipController.SaveUserRelationshipPreference(preference);
+
+            // Assert
+            var logContent = string.Format(Constants.LOCALIZATION_UserRelationshipPreference_Updated, Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID);
+            mockEventLogController.Verify(e => e.AddLog("Message", logContent, EventLogController.EventLogType.ADMIN_ALERT));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void RelationshipController_InitiateUserRelationship_Throws_On_Negative_RelationshipID()
+        {
+            // Arrange
+            var relationshipController = this.CreateRelationshipController();
+            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
+            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
+            var relationship = new Relationship();
+
+            // Act, Assert
+            relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
+        }
+
+        [Test]
+        public void RelationshipController_InitiateUserRelationship_Returns_Status_Accepted_When_Default_Relationship_Action_Is_Accepted()
+        {
+            // Arrange
+            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
+            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
+            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
+
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Clear();
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
+            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
+
+            // Assert
+            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Accepted);
+        }
+
+        [Test]
+        public void RelationshipController_InitiateUserRelationship_Returns_Status_Initiated_When_Default_Relationship_Action_Is_None()
+        {
+            // Arrange
+            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
+            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
+            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.None };
+
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Clear();
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
+            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
+
+            // Assert
+            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Pending);
+        }
+
+        [Test]
+        public void RelationshipController_InitiateUserRelationship_Returns_Status_Accepted_When_TargetUsers_Relationship_Action_Is_Accepted()
+        {
+            // Arrange
+            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
+            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
+            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
+
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Add(Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_TenId, Constants.USER_ElevenId, RelationshipStatus.Accepted);
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
+            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
+
+            // Assert
+            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Accepted);
+        }
+
+        [Test]
+        public void RelationshipController_InitiateUserRelationship_Returns_Status_Initiated_When_TargetUsers_Relationship_Action_Is_None()
+        {
+            // Arrange
+            var initiatingUser = new UserInfo { UserID = Constants.USER_TenId, PortalID = Constants.PORTAL_Zero };
+            var targetUser = new UserInfo { UserID = Constants.USER_ElevenId, PortalID = Constants.PORTAL_Zero };
+            var relationship = new Relationship { RelationshipId = Constants.SOCIAL_FollowerRelationshipID, RelationshipTypeId = Constants.SOCIAL_FollowerRelationshipTypeID, DefaultResponse = RelationshipStatus.Accepted };
+
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Clear();
+            this.dtUserRelationshipPreferences.Rows.Add(Constants.SOCIAL_PrefereceIDForUser11, Constants.USER_TenId, Constants.USER_ElevenId, RelationshipStatus.None);
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<RelationshipDirection>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.GetUserRelationshipPreference(It.IsAny<int>(), It.IsAny<int>())).Returns(this.dtUserRelationshipPreferences.CreateDataReader());
+            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            var userRelationship = relationshipController.InitiateUserRelationship(initiatingUser, targetUser, relationship);
+
+            // Assert
+            Assert.AreEqual(userRelationship.Status, RelationshipStatus.Pending);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UserRelationshipDoesNotExistException))]
+        public void RelationshipController_RemoveUserRelationship_Throws_On_NonExistent_Relationship()
+        {
+            // Arrange
+
+            // No UserRelationship between user10 and user11
+            this.dtUserRelationships.Rows.Clear();
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act, Assert
+            relationshipController.RemoveUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UserRelationshipDoesNotExistException))]
+        public void RelationshipController_AcceptRelationship_Throws_On_NonExistent_Relationship()
+        {
+            // Arrange
+
+            // No UserRelationship between user10 and user11
+            this.dtUserRelationships.Rows.Clear();
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act, Assert
+            relationshipController.AcceptUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
+        }
+
+        [Test]
+        public void RelationshipController_AcceptUserRelationship_Calls_DataService_On_Valid_RelationshipID()
+        {
+            // Arrange
+
+            // Any UserRelationship between user10 and user11
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationships.Rows.Add(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()));
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            relationshipController.AcceptUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
+
+            // Assert
+            mockDataService.Verify(ds => ds.SaveUserRelationship(It.IsAny<UserRelationship>(), It.IsAny<int>()));
+        }
+
+        [Test]
+        public void RelationshipController_RemoveUserRelationship_Calls_DataService_On_Valid_RelationshipID()
+        {
+            // Arrange
+
+            // Any UserRelationship between user10 and user11
+            this.dtUserRelationships.Rows.Clear();
+            this.dtUserRelationships.Rows.Add(Constants.SOCIAL_UserRelationshipIDUser10User11, Constants.USER_TenId, Constants.USER_ElevenId, Constants.SOCIAL_FriendRelationshipID, RelationshipStatus.None);
+
+            // setup mock DataService
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetUserRelationship(It.IsAny<int>())).Returns(this.dtUserRelationships.CreateDataReader());
+            mockDataService.Setup(md => md.DeleteUserRelationship(It.IsAny<int>()));
+
+            var relationshipController = this.CreateRelationshipController(mockDataService);
+
+            // Act
+            relationshipController.RemoveUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11);
+
+            // Assert
+            mockDataService.Verify(ds => ds.DeleteUserRelationship(Constants.SOCIAL_UserRelationshipIDUser10User11));
+        }
+
+        private static PortalInfo CreatePortalInfo(int portalId, int portalGroupId)
+        {
+            var mockPortalInfo = new PortalInfo { PortalID = portalId, PortalGroupID = portalGroupId };
+            return mockPortalInfo;
+        }
+
+        private static PortalGroupInfo CreatePortalGroupInfo(int portalGroupId, int masterPortalId)
+        {
+            var mockPortalGroupInfo = new PortalGroupInfo
+            {
+                PortalGroupId = portalGroupId,
+                MasterPortalId = masterPortalId,
+                PortalGroupName = Constants.PORTALGROUP_ValidName,
+                PortalGroupDescription = Constants.PORTALGROUP_ValidDescription,
+            };
+
+            return mockPortalGroupInfo;
+        }
+
+        private Mock<IDataService> CreateMockDataServiceWithRelationshipTypes()
+        {
+            var mockDataService = new Mock<IDataService>();
+            mockDataService.Setup(md => md.GetAllRelationshipTypes()).Returns(this.dtRelationshipTypes.CreateDataReader());
+            mockDataService.Setup(md => md.GetRelationshipsByPortalId(It.IsAny<int>())).Returns(this.dtRelationships.CreateDataReader());
+            return mockDataService;
+        }
+
+        private void CreateLocalizationProvider()
+        {
+            var mockProvider = MockComponentProvider.CreateLocalizationProvider();
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_RelationshipType_Deleted_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_RelationshipType_Deleted);
+
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_RelationshipType_Updated_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_RelationshipType_Updated);
+
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_Relationship_Deleted_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_Relationship_Deleted);
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_Relationship_Updated_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_Relationship_Updated);
+
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationshipPreference_Deleted_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_UserRelationshipPreference_Deleted);
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationshipPreference_Updated_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_UserRelationshipPreference_Updated);
+
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Deleted_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_UserRelationship_Deleted);
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Added_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_UserRelationship_Added);
+            mockProvider.Setup(l => l.GetString(Constants.LOCALIZATION_UserRelationship_Updated_Key, It.IsAny<string>()))
+                        .Returns(Constants.LOCALIZATION_UserRelationship_Updated);
+        }
+
+        private RelationshipControllerImpl CreateRelationshipController()
+        {
+            var mockDataService = new Mock<IDataService>();
+            return this.CreateRelationshipController(mockDataService);
+        }
+
+        private RelationshipControllerImpl CreateRelationshipController(Mock<IDataService> mockDataService)
+        {
+            var mockEventLogController = new Mock<IEventLogController>();
+            return new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
+        }
+
+        private RelationshipControllerImpl CreateRelationshipController(Mock<IEventLogController> mockEventLogController)
+        {
+            var mockDataService = new Mock<IDataService>();
+            return new RelationshipControllerImpl(mockDataService.Object, mockEventLogController.Object);
+        }
+
+        private void SetupDataTables()
+        {
+            // RelationshipTypes
+            this.dtRelationshipTypes = new DataTable("RelationshipTypes");
+            var pkRelationshipTypeID = this.dtRelationshipTypes.Columns.Add("RelationshipTypeID", typeof(int));
+            this.dtRelationshipTypes.Columns.Add("Name", typeof(string));
+            this.dtRelationshipTypes.Columns.Add("Description", typeof(string));
+            this.dtRelationshipTypes.Columns.Add("Direction", typeof(int));
+            this.dtRelationshipTypes.Columns.Add("CreatedByUserID", typeof(int));
+            this.dtRelationshipTypes.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this.dtRelationshipTypes.Columns.Add("LastModifiedByUserID", typeof(int));
+            this.dtRelationshipTypes.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+
+            this.dtRelationshipTypes.PrimaryKey = new[] { pkRelationshipTypeID };
+
+            this.dtRelationshipTypes.Rows.Add(DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(), DefaultRelationshipTypes.Friends.ToString(), RelationshipDirection.TwoWay);
+            this.dtRelationshipTypes.Rows.Add(DefaultRelationshipTypes.Followers, DefaultRelationshipTypes.Followers.ToString(), DefaultRelationshipTypes.Followers.ToString(), RelationshipDirection.OneWay);
+
+            // Relationships
+            this.dtRelationships = new DataTable("Relationships");
+            var pkRelationshipID = this.dtRelationships.Columns.Add("RelationshipID", typeof(int));
+            this.dtRelationships.Columns.Add("RelationshipTypeID", typeof(int));
+            this.dtRelationships.Columns.Add("Name", typeof(string));
+            this.dtRelationships.Columns.Add("Description", typeof(string));
+            this.dtRelationships.Columns.Add("PortalID", typeof(int));
+            this.dtRelationships.Columns.Add("UserID", typeof(int));
+            this.dtRelationships.Columns.Add("DefaultResponse", typeof(int));
+            this.dtRelationships.Columns.Add("CreatedByUserID", typeof(int));
+            this.dtRelationships.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this.dtRelationships.Columns.Add("LastModifiedByUserID", typeof(int));
+            this.dtRelationships.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+            this.dtRelationships.PrimaryKey = new[] { pkRelationshipID };
+
+            // Create default Friend and Social Relationships
+            this.dtRelationships.Rows.Add(Constants.SOCIAL_FriendRelationshipID, DefaultRelationshipTypes.Friends, DefaultRelationshipTypes.Friends.ToString(), DefaultRelationshipTypes.Friends.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
+            this.dtRelationships.Rows.Add(Constants.SOCIAL_FollowerRelationshipID, DefaultRelationshipTypes.Followers, DefaultRelationshipTypes.Followers.ToString(), DefaultRelationshipTypes.Followers.ToString(), Constants.PORTAL_Zero, Constants.USER_Null, RelationshipStatus.None);
+
+            // UserRelationships
+            this.dtUserRelationships = new DataTable("UserRelationships");
+            var pkUserRelationshipID = this.dtUserRelationships.Columns.Add("UserRelationshipID", typeof(int));
+            this.dtUserRelationships.Columns.Add("UserID", typeof(int));
+            this.dtUserRelationships.Columns.Add("RelatedUserID", typeof(int));
+            this.dtUserRelationships.Columns.Add("RelationshipID", typeof(int));
+            this.dtUserRelationships.Columns.Add("Status", typeof(int));
+            this.dtUserRelationships.Columns.Add("CreatedByUserID", typeof(int));
+            this.dtUserRelationships.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this.dtUserRelationships.Columns.Add("LastModifiedByUserID", typeof(int));
+            this.dtUserRelationships.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+            this.dtUserRelationships.PrimaryKey = new[] { pkUserRelationshipID };
+
+            // UserRelationshipPreferences
+            this.dtUserRelationshipPreferences = new DataTable("UserRelationshipPreferences");
+            var pkPreferenceID = this.dtUserRelationshipPreferences.Columns.Add("PreferenceID", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("UserID", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("RelationshipID", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("DefaultResponse", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("CreatedByUserID", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("CreatedOnDate", typeof(DateTime));
+            this.dtUserRelationshipPreferences.Columns.Add("LastModifiedByUserID", typeof(int));
+            this.dtUserRelationshipPreferences.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+            this.dtUserRelationshipPreferences.PrimaryKey = new[] { pkPreferenceID };
+        }
+    }
 }
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/ModuleSettingsTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/ModuleSettingsTests.cs
index fba4752988a..ba0008297b1 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/ModuleSettingsTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/ModuleSettingsTests.cs	
@@ -2,283 +2,305 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Modules.Settings;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class ModuleSettingsTests : BaseSettingsTests
-    {
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        public void SaveSettings_UpdatesCache()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new ModulesSettings();
-
-            this.MockModuleSettings(moduleInfo, new Hashtable());
-            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
-            var settingsRepository = new ModulesSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void GetSettings_CallsGetCachedObject()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-
-            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new ModulesSettings());
-            var settingsRepository = new ModulesSettingsRepository();
-
-            // Act
-            settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection(string stringValue, int integerValue, double doubleValue,
-            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var moduleSettings = new Hashtable
-                                 {
-                                     { SettingNamePrefix + "StringProperty", stringValue },
-                                     { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
-                                     { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
-                                     { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
-                                     { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
-                                 };
-
-            this.MockModuleSettings(moduleInfo, moduleSettings);
-
-            var settingsRepository = new ModulesSettingsRepository();
-
-            // Act
-            var settings = settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
-            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
-            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
-            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
-            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
-            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
-            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
-            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
-            this.MockRepository.VerifyAll();
-        }
-
-        private void SaveSettings_CallsUpdateModuleSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue,
-            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new ModulesSettings
-            {
-                StringProperty = stringValue,
-                IntegerProperty = integerValue,
-                DoubleProperty = doubleValue,
-                BooleanProperty = booleanValue,
-                DateTimeProperty = datetimeValue,
-                TimeSpanProperty = timeSpanValue,
-                EnumProperty = enumValue,
-                ComplexProperty = complexValue,
-            };
-
-            this.MockModuleSettings(moduleInfo, new Hashtable());
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "StringProperty", stringValue));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "IntegerProperty", integerValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "EnumProperty", enumValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}"));
-
-            var settingsRepository = new ModulesSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        public class ModulesSettings
-        {
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public string StringProperty { get; set; } = string.Empty;
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public int IntegerProperty { get; set; }
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public double DoubleProperty { get; set; }
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public bool BooleanProperty { get; set; }
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
-
-            [ModuleSetting(Prefix = SettingNamePrefix)]
-            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
-
-            [ModuleSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
-            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
-        }
-
-        public class ModulesSettingsRepository : SettingsRepository<ModulesSettings>
-        {}
-    }
-}
+namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Modules.Settings;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class ModuleSettingsTests : BaseSettingsTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void SaveSettings_CallsUpdateModuleSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        public void SaveSettings_UpdatesCache()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new ModulesSettings();
+
+            this.MockModuleSettings(moduleInfo, new Hashtable());
+            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
+            var settingsRepository = new ModulesSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void GetSettings_CallsGetCachedObject()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+
+            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new ModulesSettings());
+            var settingsRepository = new ModulesSettingsRepository();
+
+            // Act
+            settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection(string stringValue, int integerValue, double doubleValue,
+            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var moduleSettings = new Hashtable
+                                 {
+                                     { SettingNamePrefix + "StringProperty", stringValue },
+                                     { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
+                                     { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
+                                     { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
+                                     { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
+                                 };
+
+            this.MockModuleSettings(moduleInfo, moduleSettings);
+
+            var settingsRepository = new ModulesSettingsRepository();
+
+            // Act
+            var settings = settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
+            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
+            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
+            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
+            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
+            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
+            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
+            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
+            this.MockRepository.VerifyAll();
+        }
+
+        private void SaveSettings_CallsUpdateModuleSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue,
+            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new ModulesSettings
+            {
+                StringProperty = stringValue,
+                IntegerProperty = integerValue,
+                DoubleProperty = doubleValue,
+                BooleanProperty = booleanValue,
+                DateTimeProperty = datetimeValue,
+                TimeSpanProperty = timeSpanValue,
+                EnumProperty = enumValue,
+                ComplexProperty = complexValue,
+            };
+
+            this.MockModuleSettings(moduleInfo, new Hashtable());
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "StringProperty", stringValue));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "IntegerProperty", integerValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "EnumProperty", enumValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}"));
+
+            var settingsRepository = new ModulesSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        public class ModulesSettings
+        {
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public string StringProperty { get; set; } = string.Empty;
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public int IntegerProperty { get; set; }
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public double DoubleProperty { get; set; }
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public bool BooleanProperty { get; set; }
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
+
+            [ModuleSetting(Prefix = SettingNamePrefix)]
+            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
+
+            [ModuleSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
+            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
+        }
+
+        public class ModulesSettingsRepository : SettingsRepository<ModulesSettings>
+        {}
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/NullableSettingsTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/NullableSettingsTests.cs
index 51e46f6689d..dfd8348635d 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/NullableSettingsTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/NullableSettingsTests.cs	
@@ -2,264 +2,289 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Modules.Settings;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class NullableSettingsTests : BaseSettingsTests
-    {
-        public readonly object[] NullableCases =
-        {
-            new object[] { null, null, null, null, },
-            new object[] { string.Empty, -1, DateTime.UtcNow, TimeSpan.FromMilliseconds(3215648), },
-            new object[] { "lorem ipsum", 456, DateTime.Now, DateTime.Today - DateTime.Now, },
-        };
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ar-JO")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ar_JO(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ca-ES")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ca_ES(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("zh-CN")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_zh_CN(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("en-US")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_en_US(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("fr-FR")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_fr_FR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("he-IL")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_he_IL(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ru-RU")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ru_RU(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("tr-TR")]
-        public void SaveSettings_CallsUpdateSetting_WithRightParameters_tr_TR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        public void SaveSettings_UpdatesCache()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyNullableSettings();
-
-            this.MockModuleSettings(moduleInfo, new Hashtable());
-            this.MockTabModuleSettings(moduleInfo, new Hashtable());
-            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
-            var settingsRepository = new MyNullableSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void GetSettings_CallsGetCachedObject()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-
-            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyNullableSettings());
-            var settingsRepository = new MyNullableSettingsRepository();
-
-            // Act
-            settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ar-JO")]
-        public void GetSettings_GetsValues_FromCorrectSettings_ar_JO(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ca-ES")]
-        public void GetSettings_GetsValues_FromCorrectSettings_ca_ES(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("zh-CN")]
-        public void GetSettings_GetsValues_FromCorrectSettings_zh_CN(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("en-US")]
-        public void GetSettings_GetsValues_FromCorrectSettings_en_US(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("fr-FR")]
-        public void GetSettings_GetsValues_FromCorrectSettings_fr_FR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("he-IL")]
-        public void GetSettings_GetsValues_FromCorrectSettings_he_IL(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("ru-RU")]
-        public void GetSettings_GetsValues_FromCorrectSettings_ru_RU(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(NullableCases))]
-        [SetCulture("tr-TR")]
-        public void GetSettings_GetsValues_FromCorrectSettings_tr_TR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
-        }
-
-        private void SaveSettings_CallsUpdateSetting_WithRightParameters(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyNullableSettings
-            {
-                StringProperty = stringValue,
-                IntegerProperty = integerValue,
-                DateTimeProperty = datetimeValue,
-                TimeSpanProperty = timeSpanValue,
-            };
-
-            this.MockModuleSettings(moduleInfo, new Hashtable());
-            this.MockTabModuleSettings(moduleInfo, new Hashtable());
-            var expectedStringValue = stringValue ?? string.Empty;
-            this.MockModuleController.Setup(pc => pc.UpdateModuleSetting(ModuleId, "StringProperty", expectedStringValue));
-            var integerString = integerValue?.ToString() ?? string.Empty;
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, "IntegerProperty", integerString, true, Null.NullString, false));
-            var dateTimeString = datetimeValue?.ToString("o", CultureInfo.InvariantCulture) ?? string.Empty;
-            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, "DateTimeProperty", dateTimeString));
-            var timeSpanString = timeSpanValue?.ToString("c", CultureInfo.InvariantCulture) ?? string.Empty;
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, "TimeSpanProperty", timeSpanString));
-
-            var settingsRepository = new MyNullableSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        private void GetSettings_GetsValues_FromCorrectSettings(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
-        {
-            // Arrange
-            var expectedStringValue = stringValue ?? string.Empty;
-            var moduleInfo = GetModuleInfo;
-            var portalSettings = new Dictionary<string, string> { ["IntegerProperty"] = integerValue?.ToString() ?? string.Empty, };
-            var moduleSettings = new Hashtable { ["DateTimeProperty"] = datetimeValue?.ToString("o", CultureInfo.InvariantCulture) ?? string.Empty, ["StringProperty"] = expectedStringValue, };
-            var tabModuleSettings = new Hashtable { ["TimeSpanProperty"] = timeSpanValue?.ToString("c", CultureInfo.InvariantCulture) ?? string.Empty, };
-
-            this.MockPortalSettings(moduleInfo, portalSettings);
-            this.MockModuleSettings(moduleInfo, moduleSettings);
-            this.MockTabModuleSettings(moduleInfo, tabModuleSettings);
-
-            var settingsRepository = new MyNullableSettingsRepository();
-
-            // Act
-            var settings = settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            Assert.AreEqual(expectedStringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
-            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
-            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
-            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
-            this.MockRepository.VerifyAll();
-        }
-
-        public class MyNullableSettings
-        {
-            [ModuleSetting]
-            public string StringProperty { get; set; } = "Default Value";
-
-            [PortalSetting]
-            public int? IntegerProperty { get; set; } = 500;
-
-            [ModuleSetting]
-            public DateTime? DateTimeProperty { get; set; } = DateTime.MaxValue;
-
-            [TabModuleSetting]
-            public TimeSpan? TimeSpanProperty { get; set; } = TimeSpan.FromHours(12);
-        }
-
-        public class MyNullableSettingsRepository : SettingsRepository<MyNullableSettings>
-        {}
-    }
-}
+namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Modules.Settings;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class NullableSettingsTests : BaseSettingsTests
+    {
+        public readonly object[] NullableCases =
+        {
+            new object[] { null, null, null, null, },
+            new object[] { string.Empty, -1, DateTime.UtcNow, TimeSpan.FromMilliseconds(3215648), },
+            new object[] { "lorem ipsum", 456, DateTime.Now, DateTime.Today - DateTime.Now, },
+        };
+
+        [SetUp]
+        public void Setup()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ar-JO")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ar_JO(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ca-ES")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ca_ES(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("zh-CN")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_zh_CN(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("en-US")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_en_US(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("fr-FR")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_fr_FR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("he-IL")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_he_IL(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ru-RU")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_ru_RU(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("tr-TR")]
+        public void SaveSettings_CallsUpdateSetting_WithRightParameters_tr_TR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.SaveSettings_CallsUpdateSetting_WithRightParameters(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        public void SaveSettings_UpdatesCache()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyNullableSettings();
+
+            this.MockModuleSettings(moduleInfo, new Hashtable());
+            this.MockTabModuleSettings(moduleInfo, new Hashtable());
+            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
+            var settingsRepository = new MyNullableSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void GetSettings_CallsGetCachedObject()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+
+            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyNullableSettings());
+            var settingsRepository = new MyNullableSettingsRepository();
+
+            // Act
+            settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ar-JO")]
+        public void GetSettings_GetsValues_FromCorrectSettings_ar_JO(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ca-ES")]
+        public void GetSettings_GetsValues_FromCorrectSettings_ca_ES(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("zh-CN")]
+        public void GetSettings_GetsValues_FromCorrectSettings_zh_CN(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("en-US")]
+        public void GetSettings_GetsValues_FromCorrectSettings_en_US(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("fr-FR")]
+        public void GetSettings_GetsValues_FromCorrectSettings_fr_FR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("he-IL")]
+        public void GetSettings_GetsValues_FromCorrectSettings_he_IL(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("ru-RU")]
+        public void GetSettings_GetsValues_FromCorrectSettings_ru_RU(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(NullableCases))]
+        [SetCulture("tr-TR")]
+        public void GetSettings_GetsValues_FromCorrectSettings_tr_TR(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            this.GetSettings_GetsValues_FromCorrectSettings(stringValue, integerValue, datetimeValue, timeSpanValue);
+        }
+
+        private void SaveSettings_CallsUpdateSetting_WithRightParameters(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyNullableSettings
+            {
+                StringProperty = stringValue,
+                IntegerProperty = integerValue,
+                DateTimeProperty = datetimeValue,
+                TimeSpanProperty = timeSpanValue,
+            };
+
+            this.MockModuleSettings(moduleInfo, new Hashtable());
+            this.MockTabModuleSettings(moduleInfo, new Hashtable());
+            var expectedStringValue = stringValue ?? string.Empty;
+            this.MockModuleController.Setup(pc => pc.UpdateModuleSetting(ModuleId, "StringProperty", expectedStringValue));
+            var integerString = integerValue?.ToString() ?? string.Empty;
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, "IntegerProperty", integerString, true, Null.NullString, false));
+            var dateTimeString = datetimeValue?.ToString("o", CultureInfo.InvariantCulture) ?? string.Empty;
+            this.MockModuleController.Setup(mc => mc.UpdateModuleSetting(ModuleId, "DateTimeProperty", dateTimeString));
+            var timeSpanString = timeSpanValue?.ToString("c", CultureInfo.InvariantCulture) ?? string.Empty;
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, "TimeSpanProperty", timeSpanString));
+
+            var settingsRepository = new MyNullableSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        private void GetSettings_GetsValues_FromCorrectSettings(string stringValue, int? integerValue, DateTime? datetimeValue, TimeSpan? timeSpanValue)
+        {
+            // Arrange
+            var expectedStringValue = stringValue ?? string.Empty;
+            var moduleInfo = GetModuleInfo;
+            var portalSettings = new Dictionary<string, string> { ["IntegerProperty"] = integerValue?.ToString() ?? string.Empty, };
+            var moduleSettings = new Hashtable { ["DateTimeProperty"] = datetimeValue?.ToString("o", CultureInfo.InvariantCulture) ?? string.Empty, ["StringProperty"] = expectedStringValue, };
+            var tabModuleSettings = new Hashtable { ["TimeSpanProperty"] = timeSpanValue?.ToString("c", CultureInfo.InvariantCulture) ?? string.Empty, };
+
+            this.MockPortalSettings(moduleInfo, portalSettings);
+            this.MockModuleSettings(moduleInfo, moduleSettings);
+            this.MockTabModuleSettings(moduleInfo, tabModuleSettings);
+
+            var settingsRepository = new MyNullableSettingsRepository();
+
+            // Act
+            var settings = settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            Assert.AreEqual(expectedStringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
+            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
+            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
+            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
+            this.MockRepository.VerifyAll();
+        }
+
+        public class MyNullableSettings
+        {
+            [ModuleSetting]
+            public string StringProperty { get; set; } = "Default Value";
+
+            [PortalSetting]
+            public int? IntegerProperty { get; set; } = 500;
+
+            [ModuleSetting]
+            public DateTime? DateTimeProperty { get; set; } = DateTime.MaxValue;
+
+            [TabModuleSetting]
+            public TimeSpan? TimeSpanProperty { get; set; } = TimeSpan.FromHours(12);
+        }
+
+        public class MyNullableSettingsRepository : SettingsRepository<MyNullableSettings>
+        {}
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/PortalSettingsTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/PortalSettingsTests.cs
index 725631066b8..d61e3644e80 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/PortalSettingsTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/PortalSettingsTests.cs	
@@ -2,280 +2,303 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Modules.Settings;
-    using DotNetNuke.Entities.Portals;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class PortalSettingsTests : BaseSettingsTests
-    {
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        public void SaveSettings_UpdatesCache()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyPortalSettings();
-
-            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
-            var settingsRepository = new MyPortalSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void GetSettings_CallsGetCachedObject()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-
-            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyPortalSettings());
-            var settingsRepository = new MyPortalSettingsRepository();
-
-            // Act
-            settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void GetSettings_GetsValuesFrom_PortalSettings_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        private void SaveSettings_CallsUpdatePortalSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue,
-            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyPortalSettings
-            {
-                StringProperty = stringValue,
-                IntegerProperty = integerValue,
-                DoubleProperty = doubleValue,
-                BooleanProperty = booleanValue,
-                DateTimeProperty = datetimeValue,
-                TimeSpanProperty = timeSpanValue,
-                EnumProperty = enumValue,
-                ComplexProperty = complexValue,
-            };
-
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "StringProperty", stringValue, true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "IntegerProperty", integerValue.ToString(), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString(), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "EnumProperty", enumValue.ToString(), true, Null.NullString, false));
-            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}", true, Null.NullString, false));
-
-            var settingsRepository = new MyPortalSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        private void GetSettings_GetsValuesFrom_PortalSettings(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var portalSettings = new Dictionary<string, string>
-                                 {
-                                     { SettingNamePrefix + "StringProperty", stringValue },
-                                     { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
-                                     { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
-                                     { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
-                                     { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
-                                     { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
-                                 };
-
-            this.MockPortalSettings(moduleInfo, portalSettings);
-
-            var settingsRepository = new MyPortalSettingsRepository();
-
-            // Act
-            var settings = settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
-            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
-            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
-            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
-            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
-            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
-            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
-            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
-            this.MockRepository.VerifyAll();
-        }
-
-        public class MyPortalSettings
-        {
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public string StringProperty { get; set; } = string.Empty;
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public int IntegerProperty { get; set; }
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public double DoubleProperty { get; set; }
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public bool BooleanProperty { get; set; }
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
-
-            [PortalSetting(Prefix = SettingNamePrefix)]
-            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
-
-            [PortalSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
-            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
-        }
-
-        public class MyPortalSettingsRepository : SettingsRepository<MyPortalSettings>
-        {}
-    }
-}
+namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Modules.Settings;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class PortalSettingsTests : BaseSettingsTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void SaveSettings_CallsUpdatePortalSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdatePortalSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        public void SaveSettings_UpdatesCache()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyPortalSettings();
+
+            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
+            var settingsRepository = new MyPortalSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void GetSettings_CallsGetCachedObject()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+
+            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyPortalSettings());
+            var settingsRepository = new MyPortalSettingsRepository();
+
+            // Act
+            settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void GetSettings_GetsValuesFrom_PortalSettings_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_PortalSettings(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        private void SaveSettings_CallsUpdatePortalSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue,
+            bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyPortalSettings
+            {
+                StringProperty = stringValue,
+                IntegerProperty = integerValue,
+                DoubleProperty = doubleValue,
+                BooleanProperty = booleanValue,
+                DateTimeProperty = datetimeValue,
+                TimeSpanProperty = timeSpanValue,
+                EnumProperty = enumValue,
+                ComplexProperty = complexValue,
+            };
+
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "StringProperty", stringValue, true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "IntegerProperty", integerValue.ToString(), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString(), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "EnumProperty", enumValue.ToString(), true, Null.NullString, false));
+            this.MockPortalController.Setup(pc => pc.UpdatePortalSetting(PortalId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}", true, Null.NullString, false));
+
+            var settingsRepository = new MyPortalSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        private void GetSettings_GetsValuesFrom_PortalSettings(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var portalSettings = new Dictionary<string, string>
+                                 {
+                                     { SettingNamePrefix + "StringProperty", stringValue },
+                                     { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
+                                     { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
+                                     { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
+                                     { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
+                                     { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
+                                 };
+
+            this.MockPortalSettings(moduleInfo, portalSettings);
+
+            var settingsRepository = new MyPortalSettingsRepository();
+
+            // Act
+            var settings = settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
+            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
+            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
+            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
+            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
+            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
+            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
+            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
+            this.MockRepository.VerifyAll();
+        }
+
+        public class MyPortalSettings
+        {
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public string StringProperty { get; set; } = string.Empty;
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public int IntegerProperty { get; set; }
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public double DoubleProperty { get; set; }
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public bool BooleanProperty { get; set; }
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
+
+            [PortalSetting(Prefix = SettingNamePrefix)]
+            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
+
+            [PortalSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
+            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
+        }
+
+        public class MyPortalSettingsRepository : SettingsRepository<MyPortalSettings>
+        {}
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/TabModuleSettingsTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/TabModuleSettingsTests.cs
index 5d7ed767a43..cc799b4d0bb 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/TabModuleSettingsTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Modules/Settings/TabModuleSettingsTests.cs	
@@ -2,282 +2,304 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Modules.Settings;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class TabModuleSettingsTests : BaseSettingsTests
-    {
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        public void SaveSettings_UpdatesCache()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyTabModuleSettings();
-
-            this.MockTabModuleSettings(moduleInfo, new Hashtable());
-            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
-            var settingsRepository = new MyTabModuleSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void GetSettings_CallsGetCachedObject()
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-
-            this.MockTabModuleSettings(moduleInfo, new Hashtable());
-            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyTabModuleSettings());
-            var settingsRepository = new MyTabModuleSettingsRepository();
-
-            // Act
-            settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ar-JO")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ca-ES")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("zh-CN")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("en-US")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("fr-FR")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("he-IL")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("ru-RU")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        [Test]
-        [TestCaseSource(nameof(SettingsCases))]
-        [SetCulture("tr-TR")]
-        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
-        }
-
-        private void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var settings = new MyTabModuleSettings
-            {
-                StringProperty = stringValue,
-                IntegerProperty = integerValue,
-                DoubleProperty = doubleValue,
-                BooleanProperty = booleanValue,
-                DateTimeProperty = datetimeValue,
-                TimeSpanProperty = timeSpanValue,
-                EnumProperty = enumValue,
-                ComplexProperty = complexValue,
-            };
-
-            this.MockTabModuleSettings(moduleInfo, new Hashtable());
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "StringProperty", stringValue));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "IntegerProperty", integerValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture)));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "EnumProperty", enumValue.ToString()));
-            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}"));
-
-            var settingsRepository = new MyTabModuleSettingsRepository();
-
-            // Act
-            settingsRepository.SaveSettings(moduleInfo, settings);
-
-            // Assert
-            this.MockRepository.VerifyAll();
-        }
-
-        private void GetSettings_GetsValuesFrom_ModuleSettingsCollection(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
-        {
-            // Arrange
-            var moduleInfo = GetModuleInfo;
-            var tabModuleSettings = new Hashtable
-                                    {
-                                        { SettingNamePrefix + "StringProperty", stringValue },
-                                        { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
-                                        { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
-                                        { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
-                                        { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
-                                        { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
-                                        { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
-                                        { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
-                                    };
-
-            this.MockTabModuleSettings(moduleInfo, tabModuleSettings);
-
-            var settingsRepository = new MyTabModuleSettingsRepository();
-
-            // Act
-            var settings = settingsRepository.GetSettings(moduleInfo);
-
-            // Assert
-            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
-            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
-            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
-            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
-            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
-            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
-            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
-            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
-            this.MockRepository.VerifyAll();
-        }
-
-        public class MyTabModuleSettings
-        {
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public string StringProperty { get; set; } = string.Empty;
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public int IntegerProperty { get; set; }
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public double DoubleProperty { get; set; }
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public bool BooleanProperty { get; set; }
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
-
-            [TabModuleSetting(Prefix = SettingNamePrefix)]
-            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
-
-            [TabModuleSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
-            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
-        }
-
-        public class MyTabModuleSettingsRepository : SettingsRepository<MyTabModuleSettings>
-        {}
-    }
-}
+namespace DotNetNuke.Tests.Core.Entities.Modules.Settings
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Modules.Settings;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class TabModuleSettingsTests : BaseSettingsTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        public void SaveSettings_UpdatesCache()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyTabModuleSettings();
+
+            this.MockTabModuleSettings(moduleInfo, new Hashtable());
+            this.MockCache.Setup(c => c.Insert(CacheKey(moduleInfo), settings));
+            var settingsRepository = new MyTabModuleSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void GetSettings_CallsGetCachedObject()
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+
+            this.MockTabModuleSettings(moduleInfo, new Hashtable());
+            this.MockCache.Setup(c => c.GetItem("DNN_" + CacheKey(moduleInfo))).Returns(new MyTabModuleSettings());
+            var settingsRepository = new MyTabModuleSettingsRepository();
+
+            // Act
+            settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ar-JO")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ar_JO(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ca-ES")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ca_ES(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("zh-CN")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_zh_CN(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("en-US")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_en_US(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("fr-FR")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_fr_FR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("he-IL")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_he_IL(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("ru-RU")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_ru_RU(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(SettingsCases))]
+        [SetCulture("tr-TR")]
+        public void GetSettings_GetsValuesFrom_ModuleSettingsCollection_tr_TR(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            this.GetSettings_GetsValuesFrom_ModuleSettingsCollection(stringValue, integerValue, doubleValue, booleanValue, datetimeValue, timeSpanValue, enumValue, complexValue);
+        }
+
+        private void SaveSettings_CallsUpdateTabModuleSetting_WithRightParameters(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var settings = new MyTabModuleSettings
+            {
+                StringProperty = stringValue,
+                IntegerProperty = integerValue,
+                DoubleProperty = doubleValue,
+                BooleanProperty = booleanValue,
+                DateTimeProperty = datetimeValue,
+                TimeSpanProperty = timeSpanValue,
+                EnumProperty = enumValue,
+                ComplexProperty = complexValue,
+            };
+
+            this.MockTabModuleSettings(moduleInfo, new Hashtable());
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "StringProperty", stringValue));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "IntegerProperty", integerValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "BooleanProperty", booleanValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture)));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "EnumProperty", enumValue.ToString()));
+            this.MockModuleController.Setup(mc => mc.UpdateTabModuleSetting(TabModuleId, SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}"));
+
+            var settingsRepository = new MyTabModuleSettingsRepository();
+
+            // Act
+            settingsRepository.SaveSettings(moduleInfo, settings);
+
+            // Assert
+            this.MockRepository.VerifyAll();
+        }
+
+        private void GetSettings_GetsValuesFrom_ModuleSettingsCollection(string stringValue, int integerValue, double doubleValue, bool booleanValue, DateTime datetimeValue, TimeSpan timeSpanValue, TestingEnum enumValue, ComplexType complexValue)
+        {
+            // Arrange
+            var moduleInfo = GetModuleInfo;
+            var tabModuleSettings = new Hashtable
+                                    {
+                                        { SettingNamePrefix + "StringProperty", stringValue },
+                                        { SettingNamePrefix + "IntegerProperty", integerValue.ToString() },
+                                        { SettingNamePrefix + "DoubleProperty", doubleValue.ToString(CultureInfo.InvariantCulture) },
+                                        { SettingNamePrefix + "BooleanProperty", booleanValue.ToString() },
+                                        { SettingNamePrefix + "DateTimeProperty", datetimeValue.ToString("o", CultureInfo.InvariantCulture) },
+                                        { SettingNamePrefix + "TimeSpanProperty", timeSpanValue.ToString("c", CultureInfo.InvariantCulture) },
+                                        { SettingNamePrefix + "EnumProperty", enumValue.ToString() },
+                                        { SettingNamePrefix + "ComplexProperty", $"{complexValue.X} | {complexValue.Y}" },
+                                    };
+
+            this.MockTabModuleSettings(moduleInfo, tabModuleSettings);
+
+            var settingsRepository = new MyTabModuleSettingsRepository();
+
+            // Act
+            var settings = settingsRepository.GetSettings(moduleInfo);
+
+            // Assert
+            Assert.AreEqual(stringValue, settings.StringProperty, "The retrieved string property value is not equal to the stored one");
+            Assert.AreEqual(integerValue, settings.IntegerProperty, "The retrieved integer property value is not equal to the stored one");
+            Assert.AreEqual(doubleValue, settings.DoubleProperty, "The retrieved double property value is not equal to the stored one");
+            Assert.AreEqual(booleanValue, settings.BooleanProperty, "The retrieved boolean property value is not equal to the stored one");
+            Assert.AreEqual(datetimeValue, settings.DateTimeProperty, "The retrieved datetime property value is not equal to the stored one");
+            Assert.AreEqual(timeSpanValue, settings.TimeSpanProperty, "The retrieved timespan property value is not equal to the stored one");
+            Assert.AreEqual(enumValue, settings.EnumProperty, "The retrieved enum property value is not equal to the stored one");
+            Assert.AreEqual(complexValue, settings.ComplexProperty, "The retrieved complex property value is not equal to the stored one");
+            this.MockRepository.VerifyAll();
+        }
+
+        public class MyTabModuleSettings
+        {
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public string StringProperty { get; set; } = string.Empty;
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public int IntegerProperty { get; set; }
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public double DoubleProperty { get; set; }
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public bool BooleanProperty { get; set; }
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public DateTime DateTimeProperty { get; set; } = DateTime.Now;
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public TimeSpan TimeSpanProperty { get; set; } = TimeSpan.Zero;
+
+            [TabModuleSetting(Prefix = SettingNamePrefix)]
+            public TestingEnum EnumProperty { get; set; } = TestingEnum.Value1;
+
+            [TabModuleSetting(Prefix = SettingNamePrefix, Serializer = "DotNetNuke.Tests.Core.Entities.Modules.Settings.ComplexTypeSerializer,DotNetNuke.Tests.Core")]
+            public ComplexType ComplexProperty { get; set; } = new ComplexType(20, 25);
+        }
+
+        public class MyTabModuleSettingsRepository : SettingsRepository<MyTabModuleSettings>
+        {}
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs
index dc91cadca39..029e2f61718 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Entities/Portals/PortalSettingsControllerTests.cs	
@@ -2,636 +2,627 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Entities.Portals
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Runtime.Serialization;
+namespace DotNetNuke.Tests.Core.Entities.Portals
+{
+    using System;
+    using System.Collections.Generic;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Services.Localization;
-    using DotNetNuke.Tests.Utilities.Mocks;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Services.Localization;
+    using DotNetNuke.Tests.Utilities.Mocks;
     using DotNetNuke.UI.Skins;
+
     using Microsoft.Extensions.DependencyInjection;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class PortalSettingsControllerTests
-    {
-        private const int HostPortalId = -1;
-        private const int HostTabId = 24;
-        private const int ValidPortalId = 0;
-        private const int ValidTabId = 42;
-        private const int ParentTabId = 55;
-        private const int SplashTabId = 41;
-        private const int HomeTabId = 40;
-        private const int InValidTabId = -1;
-
-        private const string DefaultSkin = "DefaultSkin";
-        private const string TabSkin = "TabSkin";
-        private const string GlobalTabSkin = "[g]TabSkin";
-
-        private const string DefaultContainer = "DefaultContainer";
-        private const string TabContainer = "TabContainer";
-        private const string GlobalTabContainer = "[g]TabContainer";
-
-        [SetUp]
-        public void SetUp()
-        {
-            MockComponentProvider.ResetContainer();
-
-            var serviceCollection = new ServiceCollection();
-            var mockApplicationInfo = new Mock<IApplicationStatusInfo>();
-            mockApplicationInfo.Setup(info => info.ApplicationMapPath).Returns("path/to/application");
-            serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationInfo.Object);
-            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            PortalController.ClearInstance();
-            TabController.ClearInstance();
-            Globals.DependencyProvider = null;
-
-        }
-
-        [Test]
-        [TestCaseSource(typeof(PortalSettingsControllerTestFactory), "LoadPortalSettings_Loads_Default_Value")]
-        public void LoadPortalSettings_Loads_Default_Value(Dictionary<string, string> testFields)
-        {
-            // Arrange
-            var propertyName = testFields["PropertyName"];
-            var settingName = testFields["SettingName"];
-            var isHostDefault = bool.Parse(testFields["IsHostDefault"]);
-            var defaultValue = testFields["DefaultValue"];
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
-
-            var mockPortalController = new Mock<IPortalController>();
-            mockPortalController
-                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
-                .Returns(new Dictionary<string, string>());
-            PortalController.SetTestableInstance(mockPortalController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
-                            .Returns((string s) => hostSettings[s]);
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
-                            .Returns((string s1, string s2) => hostSettings[s1]);
-            mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
-                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
-            mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
-                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
-            mockHostController.Setup(c => c.GetInteger(It.IsAny<string>()))
-                            .Returns((string s) => int.Parse(hostSettings[s]));
-            HostController.RegisterInstance(mockHostController.Object);
-
-            if (isHostDefault)
-            {
-                defaultValue = hostSettings[settingName];
-            }
-
-            // Act
-            controller.LoadPortalSettings(settings);
-
-            // Assert
-            var property = settings.GetType().GetProperty(propertyName);
-            var actualValue = property.GetValue(settings, null);
-            if (actualValue is bool)
-            {
-                Assert.AreEqual(defaultValue, actualValue.ToString().ToLowerInvariant());
-            }
-            else
-            {
-                Assert.AreEqual(defaultValue, actualValue.ToString());
-            }
-        }
-
-        [Test]
-        [TestCaseSource(typeof(PortalSettingsControllerTestFactory), "LoadPortalSettings_Loads_Setting_Value")]
-        public void LoadPortalSettings_Loads_Setting_Value(Dictionary<string, string> testFields)
-        {
-            // Arrange
-            var propertyName = testFields["PropertyName"];
-            var settingName = testFields["SettingName"];
-            var settingValue = testFields["SettingValue"];
-            var propertyValue = testFields.ContainsKey("PropertyValue") ? testFields["PropertyValue"] : settingValue;
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
-
-            var mockPortalController = new Mock<IPortalController>();
-            mockPortalController
-                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
-                .Returns(new Dictionary<string, string> { { settingName, settingValue } });
-            PortalController.SetTestableInstance(mockPortalController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
-                            .Returns((string s) => hostSettings[s]);
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
-                            .Returns((string s1, string s2) => hostSettings[s1]);
-            mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
-                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
-            mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
-                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.LoadPortalSettings(settings);
-
-            // Assert
-            var property = settings.GetType().GetProperty(propertyName);
-            var actualValue = property.GetValue(settings, null);
-            if (actualValue is bool)
-            {
-                Assert.AreEqual(propertyValue, actualValue.ToString().ToLowerInvariant());
-            }
-            else
-            {
-                Assert.AreEqual(propertyValue, actualValue.ToString());
-            }
-        }
-
-        [Test]
-        public void LoadPortalSettings_Sets_TimeZone_Property_To_Local_TimeZone()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
-
-            var mockPortalController = new Mock<IPortalController>();
-            mockPortalController
-                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
-                .Returns(new Dictionary<string, string>());
-            PortalController.SetTestableInstance(mockPortalController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
-                            .Returns((string s) => hostSettings[s]);
-            mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
-                            .Returns((string s1, string s2) => hostSettings[s1]);
-            mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
-                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
-            mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
-                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.LoadPortalSettings(settings);
-
-            // Assert
-            Assert.AreEqual(TimeZoneInfo.Local, settings.TimeZone);
-        }
-
-        [Test]
-        public void LoadPortal_Loads_Portal_Property_Values()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var portal = new PortalInfo()
-            {
-                Users = 2,
-                Pages = 5,
-                DefaultLanguage = Localization.SystemLocale,
-                HomeDirectory = "Portals/0",
-            };
-            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
-
-            // Act
-            controller.LoadPortal(portal, settings);
-
-            // Assert
-            Assert.AreEqual(portal.AdminTabId, settings.AdminTabId);
-            Assert.AreEqual(portal.AdministratorId, settings.AdministratorId);
-            Assert.AreEqual(portal.AdministratorRoleId, settings.AdministratorRoleId);
-            Assert.AreEqual(portal.AdministratorRoleName, settings.AdministratorRoleName);
-            Assert.AreEqual(portal.BackgroundFile, settings.BackgroundFile);
-            Assert.AreEqual(portal.BannerAdvertising, settings.BannerAdvertising);
-            Assert.AreEqual(portal.CultureCode, settings.CultureCode);
-            Assert.AreEqual(portal.Currency, settings.Currency);
-            Assert.AreEqual(portal.Custom404TabId, settings.ErrorPage404);
-            Assert.AreEqual(portal.Custom500TabId, settings.ErrorPage500);
-            Assert.AreEqual(portal.TermsTabId, settings.TermsTabId);
-            Assert.AreEqual(portal.PrivacyTabId, settings.PrivacyTabId);
-            Assert.AreEqual(portal.DefaultLanguage, settings.DefaultLanguage);
-            Assert.AreEqual(portal.Description, settings.Description);
-            Assert.AreEqual(portal.Email, settings.Email);
-            Assert.AreEqual(portal.ExpiryDate, settings.ExpiryDate);
-            Assert.AreEqual(portal.FooterText, settings.FooterText);
-            Assert.AreEqual(portal.GUID, settings.GUID);
-            Assert.AreEqual(Globals.ApplicationPath + "/" + portal.HomeDirectory + "/", settings.HomeDirectory);
-            Assert.AreEqual(portal.HomeDirectoryMapPath, settings.HomeDirectoryMapPath);
-            Assert.AreEqual(Globals.ApplicationPath + "/" + portal.HomeSystemDirectory + "/", settings.HomeSystemDirectory);
-            Assert.AreEqual(portal.HomeSystemDirectoryMapPath, settings.HomeSystemDirectoryMapPath);
-            Assert.AreEqual(portal.HomeTabId, settings.HomeTabId);
-            Assert.AreEqual(portal.HostFee, settings.HostFee);
-            Assert.AreEqual(portal.HostSpace, settings.HostSpace);
-            Assert.AreEqual(portal.KeyWords, settings.KeyWords);
-            Assert.AreEqual(portal.LoginTabId, settings.LoginTabId);
-            Assert.AreEqual(portal.LogoFile, settings.LogoFile);
-            Assert.AreEqual(portal.PageQuota, settings.PageQuota);
-            Assert.AreEqual(portal.Pages, settings.Pages);
-            Assert.AreEqual(portal.PortalName, settings.PortalName);
-            Assert.AreEqual(portal.RegisterTabId, settings.RegisterTabId);
-            Assert.AreEqual(portal.RegisteredRoleId, settings.RegisteredRoleId);
-            Assert.AreEqual(portal.RegisteredRoleName, settings.RegisteredRoleName);
-            Assert.AreEqual(portal.SearchTabId, settings.SearchTabId);
-            Assert.AreEqual(portal.SplashTabId, settings.SplashTabId);
-            Assert.AreEqual(portal.SuperTabId, settings.SuperTabId);
-            Assert.AreEqual(portal.UserQuota, settings.UserQuota);
-            Assert.AreEqual(portal.UserRegistration, settings.UserRegistration);
-            Assert.AreEqual(portal.UserTabId, settings.UserTabId);
-            Assert.AreEqual(portal.Users, settings.Users);
-        }
-
-        [Test]
-        public void GetActiveTab_Gets_Correct_Tab_If_Valid_Portal_TabId()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(ValidTabId, settings);
-
-            // Assert
-            Assert.AreEqual(validTab.TabID, tab.TabID);
-        }
-
-        [Test]
-        public void GetActiveTab_Gets_Correct_Tab_If_Valid_Host_TabId()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = HostTabId, PortalID = HostPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(HostTabId, settings);
-
-            // Assert
-            Assert.AreEqual(validTab.TabID, tab.TabID);
-        }
-
-        [Test]
-        public void GetActiveTab_Gets_Splash_Tab_If_InValid_TabId_And_SplashTab_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, SplashTabId = SplashTabId, CultureCode = Null.NullString };
-            var splashTabId = new TabInfo { TabID = SplashTabId, PortalID = ValidPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { splashTabId }));
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(InValidTabId, settings);
-
-            // Assert
-            Assert.AreEqual(SplashTabId, tab.TabID);
-        }
-
-        [Test]
-        public void GetActiveTab_Gets_Home_Tab_If_InValid_TabId_And_Home_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, HomeTabId = HomeTabId, CultureCode = Null.NullString };
-            var homeTabId = new TabInfo { TabID = HomeTabId, PortalID = ValidPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { homeTabId }));
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(InValidTabId, settings);
-
-            // Assert
-            Assert.AreEqual(HomeTabId, tab.TabID);
-        }
-
-        [Test]
-        public void GetActiveTab_Gets_Splash_Tab_If_InValid_TabId_And_Both_HomeTab_And_SplashTab_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, SplashTabId = SplashTabId, HomeTabId = HomeTabId, CultureCode = Null.NullString };
-            var splashTabId = new TabInfo { TabID = SplashTabId, PortalID = ValidPortalId };
-            var homeTabId = new TabInfo { TabID = HomeTabId, PortalID = ValidPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { splashTabId, homeTabId }));
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(InValidTabId, settings);
-
-            // Assert
-            Assert.AreEqual(SplashTabId, tab.TabID);
-        }
-
-        [Test]
-        public void GetActiveTab_Sets_StartDate_And_EndDate_Of_Tab_If_Not_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            var tab = controller.GetActiveTab(ValidTabId, settings);
-
-            // Assert
-            Assert.AreEqual(DateTime.MinValue, tab.StartDate);
-            Assert.AreEqual(DateTime.MaxValue, tab.EndDate);
-        }
-
-        [Test]
-        public void ConfigureTab_Uses_PortalSettings_DefaultSkin_If_SkinSrc_Not_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
-            settings.ActiveTab = validTab;
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalSkin")).Returns(DefaultSkin);
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(DefaultSkin, settings.ActiveTab.SkinSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Uses_Tab_SkinSrc_If_SkinSrc_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = TabSkin };
-            settings.ActiveTab = validTab;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(TabSkin, settings.ActiveTab.SkinSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Formats_Tab_SkinSrc_If_Neccessary()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = GlobalTabSkin };
-            settings.ActiveTab = validTab;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(SkinController.FormatSkinSrc(GlobalTabSkin, settings), settings.ActiveTab.SkinSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Uses_PortalSettings_DefaultContainer_If_ContainerSrc_Not_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
-            settings.ActiveTab = validTab;
-            settings.ActiveTab.SkinSrc = TabSkin;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(DefaultContainer, settings.ActiveTab.ContainerSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Uses_Tab_ContainerSrc_If_ContainerSrc_Set()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ContainerSrc = TabContainer };
-            settings.ActiveTab = validTab;
-            settings.ActiveTab.SkinSrc = TabSkin;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(TabContainer, settings.ActiveTab.ContainerSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Formats_Tab_ContainerSrc_If_Neccessary()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ContainerSrc = GlobalTabContainer };
-            settings.ActiveTab = validTab;
-            settings.ActiveTab.SkinSrc = TabSkin;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.AreEqual(SkinController.FormatSkinSrc(GlobalTabContainer, settings), settings.ActiveTab.ContainerSrc);
-        }
-
-        [Test]
-        public void ConfigureTab_Builds_Breadcrumbs_For_Tab()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = GlobalTabSkin };
-            settings.ActiveTab = validTab;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            Assert.NotNull(settings.ActiveTab.BreadCrumbs);
-            Assert.AreEqual(1, settings.ActiveTab.BreadCrumbs.Count);
-        }
-
-        [Test]
-        public void ConfigureTab_Builds_Breadcrumbs_For_Tab_And_Parent()
-        {
-            // Arrange
-            var controller = new PortalSettingsController();
-            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
-            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ParentId = ParentTabId };
-            var parentTab = new TabInfo { TabID = ParentTabId, PortalID = ValidPortalId };
-            settings.ActiveTab = validTab;
-            settings.ActiveTab.SkinSrc = TabSkin;
-
-            var mockLocaleController = new Mock<ILocaleController>();
-            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
-            LocaleController.RegisterInstance(mockLocaleController.Object);
-
-            var mockTabController = new Mock<ITabController>();
-            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab, parentTab }));
-            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
-            TabController.SetTestableInstance(mockTabController.Object);
-
-            var mockHostController = new Mock<IHostController>();
-            mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
-            HostController.RegisterInstance(mockHostController.Object);
-
-            // Act
-            controller.ConfigureActiveTab(settings);
-
-            // Assert
-            var actualParent = settings.ActiveTab.BreadCrumbs[0] as TabInfo;
-            var actualTab = settings.ActiveTab.BreadCrumbs[1] as TabInfo;
-            Assert.AreEqual(2, settings.ActiveTab.BreadCrumbs.Count);
-            Assert.AreEqual(ValidTabId, actualTab.TabID);
-            Assert.AreEqual(ParentTabId, actualParent.TabID);
-        }
-    }
-}
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class PortalSettingsControllerTests
+    {
+        private const int HostPortalId = -1;
+        private const int HostTabId = 24;
+        private const int ValidPortalId = 0;
+        private const int ValidTabId = 42;
+        private const int ParentTabId = 55;
+        private const int SplashTabId = 41;
+        private const int HomeTabId = 40;
+        private const int InValidTabId = -1;
+
+        private const string DefaultSkin = "DefaultSkin";
+        private const string TabSkin = "TabSkin";
+        private const string GlobalTabSkin = "[g]TabSkin";
+
+        private const string DefaultContainer = "DefaultContainer";
+        private const string TabContainer = "TabContainer";
+        private const string GlobalTabContainer = "[g]TabContainer";
+
+        private Mock<IHostController> mockHostController;
+
+        [SetUp]
+        public void SetUp()
+        {
+            MockComponentProvider.ResetContainer();
+
+            var serviceCollection = new ServiceCollection();
+            var mockApplicationInfo = new Mock<IApplicationStatusInfo>();
+            mockApplicationInfo.Setup(info => info.ApplicationMapPath).Returns("path/to/application");
+
+            this.mockHostController = new Mock<IHostController>();
+            this.mockHostController.As<IHostSettingsService>();
+
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationInfo.Object);
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            PortalController.ClearInstance();
+            TabController.ClearInstance();
+            Globals.DependencyProvider = null;
+
+        }
+
+        [Test]
+        [TestCaseSource(typeof(PortalSettingsControllerTestFactory), "LoadPortalSettings_Loads_Default_Value")]
+        public void LoadPortalSettings_Loads_Default_Value(Dictionary<string, string> testFields)
+        {
+            // Arrange
+            var propertyName = testFields["PropertyName"];
+            var settingName = testFields["SettingName"];
+            var isHostDefault = bool.Parse(testFields["IsHostDefault"]);
+            var defaultValue = testFields["DefaultValue"];
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
+
+            var mockPortalController = new Mock<IPortalController>();
+            mockPortalController
+                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
+                .Returns(new Dictionary<string, string>());
+            PortalController.SetTestableInstance(mockPortalController.Object);
+
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
+                            .Returns((string s) => hostSettings[s]);
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
+                            .Returns((string s1, string s2) => hostSettings[s1]);
+            this.mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
+                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
+            this.mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
+                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
+            this.mockHostController.Setup(c => c.GetInteger(It.IsAny<string>()))
+                            .Returns((string s) => int.Parse(hostSettings[s]));
+
+            if (isHostDefault)
+            {
+                defaultValue = hostSettings[settingName];
+            }
+
+            // Act
+            controller.LoadPortalSettings(settings);
+
+            // Assert
+            var property = settings.GetType().GetProperty(propertyName);
+            var actualValue = property.GetValue(settings, null);
+            if (actualValue is bool)
+            {
+                Assert.AreEqual(defaultValue, actualValue.ToString().ToLowerInvariant());
+            }
+            else
+            {
+                Assert.AreEqual(defaultValue, actualValue.ToString());
+            }
+        }
+
+        [Test]
+        [TestCaseSource(typeof(PortalSettingsControllerTestFactory), "LoadPortalSettings_Loads_Setting_Value")]
+        public void LoadPortalSettings_Loads_Setting_Value(Dictionary<string, string> testFields)
+        {
+            // Arrange
+            var propertyName = testFields["PropertyName"];
+            var settingName = testFields["SettingName"];
+            var settingValue = testFields["SettingValue"];
+            var propertyValue = testFields.ContainsKey("PropertyValue") ? testFields["PropertyValue"] : settingValue;
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
+
+            var mockPortalController = new Mock<IPortalController>();
+            mockPortalController
+                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
+                .Returns(new Dictionary<string, string> { { settingName, settingValue } });
+            PortalController.SetTestableInstance(mockPortalController.Object);
+
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
+                            .Returns((string s) => hostSettings[s]);
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
+                            .Returns((string s1, string s2) => hostSettings[s1]);
+            this.mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
+                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
+            this.mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
+                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
+
+            // Act
+            controller.LoadPortalSettings(settings);
+
+            // Assert
+            var property = settings.GetType().GetProperty(propertyName);
+            var actualValue = property.GetValue(settings, null);
+            if (actualValue is bool)
+            {
+                Assert.AreEqual(propertyValue, actualValue.ToString().ToLowerInvariant());
+            }
+            else
+            {
+                Assert.AreEqual(propertyValue, actualValue.ToString());
+            }
+        }
+
+        [Test]
+        public void LoadPortalSettings_Sets_TimeZone_Property_To_Local_TimeZone()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var hostSettings = PortalSettingsControllerTestFactory.GetHostSettings();
+
+            var mockPortalController = new Mock<IPortalController>();
+            mockPortalController
+                .Setup(c => c.GetPortalSettings(It.IsAny<int>()))
+                .Returns(new Dictionary<string, string>());
+            PortalController.SetTestableInstance(mockPortalController.Object);
+
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>()))
+                            .Returns((string s) => hostSettings[s]);
+            this.mockHostController.Setup(c => c.GetString(It.IsAny<string>(), It.IsAny<string>()))
+                            .Returns((string s1, string s2) => hostSettings[s1]);
+            this.mockHostController.Setup(c => c.GetBoolean(It.IsAny<string>(), It.IsAny<bool>()))
+                            .Returns((string s, bool b) => bool.Parse(hostSettings[s]));
+            this.mockHostController.Setup(c => c.GetInteger(It.IsAny<string>(), It.IsAny<int>()))
+                            .Returns((string s, int i) => int.Parse(hostSettings[s]));
+
+            // Act
+            controller.LoadPortalSettings(settings);
+
+            // Assert
+            Assert.AreEqual(TimeZoneInfo.Local, settings.TimeZone);
+        }
+
+        [Test]
+        public void LoadPortal_Loads_Portal_Property_Values()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var portal = new PortalInfo()
+            {
+                Users = 2,
+                Pages = 5,
+                DefaultLanguage = Localization.SystemLocale,
+                HomeDirectory = "Portals/0",
+            };
+            var settings = new PortalSettings() { PortalId = ValidPortalId, CultureCode = Null.NullString };
+
+            // Act
+            controller.LoadPortal(portal, settings);
+
+            // Assert
+            Assert.AreEqual(portal.AdminTabId, settings.AdminTabId);
+            Assert.AreEqual(portal.AdministratorId, settings.AdministratorId);
+            Assert.AreEqual(portal.AdministratorRoleId, settings.AdministratorRoleId);
+            Assert.AreEqual(portal.AdministratorRoleName, settings.AdministratorRoleName);
+            Assert.AreEqual(portal.BackgroundFile, settings.BackgroundFile);
+            Assert.AreEqual(portal.BannerAdvertising, settings.BannerAdvertising);
+            Assert.AreEqual(portal.CultureCode, settings.CultureCode);
+            Assert.AreEqual(portal.Currency, settings.Currency);
+            Assert.AreEqual(portal.Custom404TabId, settings.ErrorPage404);
+            Assert.AreEqual(portal.Custom500TabId, settings.ErrorPage500);
+            Assert.AreEqual(portal.TermsTabId, settings.TermsTabId);
+            Assert.AreEqual(portal.PrivacyTabId, settings.PrivacyTabId);
+            Assert.AreEqual(portal.DefaultLanguage, settings.DefaultLanguage);
+            Assert.AreEqual(portal.Description, settings.Description);
+            Assert.AreEqual(portal.Email, settings.Email);
+            Assert.AreEqual(portal.ExpiryDate, settings.ExpiryDate);
+            Assert.AreEqual(portal.FooterText, settings.FooterText);
+            Assert.AreEqual(portal.GUID, settings.GUID);
+            Assert.AreEqual(Globals.ApplicationPath + "/" + portal.HomeDirectory + "/", settings.HomeDirectory);
+            Assert.AreEqual(portal.HomeDirectoryMapPath, settings.HomeDirectoryMapPath);
+            Assert.AreEqual(Globals.ApplicationPath + "/" + portal.HomeSystemDirectory + "/", settings.HomeSystemDirectory);
+            Assert.AreEqual(portal.HomeSystemDirectoryMapPath, settings.HomeSystemDirectoryMapPath);
+            Assert.AreEqual(portal.HomeTabId, settings.HomeTabId);
+            Assert.AreEqual(portal.HostFee, settings.HostFee);
+            Assert.AreEqual(portal.HostSpace, settings.HostSpace);
+            Assert.AreEqual(portal.KeyWords, settings.KeyWords);
+            Assert.AreEqual(portal.LoginTabId, settings.LoginTabId);
+            Assert.AreEqual(portal.LogoFile, settings.LogoFile);
+            Assert.AreEqual(portal.PageQuota, settings.PageQuota);
+            Assert.AreEqual(portal.Pages, settings.Pages);
+            Assert.AreEqual(portal.PortalName, settings.PortalName);
+            Assert.AreEqual(portal.RegisterTabId, settings.RegisterTabId);
+            Assert.AreEqual(portal.RegisteredRoleId, settings.RegisteredRoleId);
+            Assert.AreEqual(portal.RegisteredRoleName, settings.RegisteredRoleName);
+            Assert.AreEqual(portal.SearchTabId, settings.SearchTabId);
+            Assert.AreEqual(portal.SplashTabId, settings.SplashTabId);
+            Assert.AreEqual(portal.SuperTabId, settings.SuperTabId);
+            Assert.AreEqual(portal.UserQuota, settings.UserQuota);
+            Assert.AreEqual(portal.UserRegistration, settings.UserRegistration);
+            Assert.AreEqual(portal.UserTabId, settings.UserTabId);
+            Assert.AreEqual(portal.Users, settings.Users);
+        }
+
+        [Test]
+        public void GetActiveTab_Gets_Correct_Tab_If_Valid_Portal_TabId()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(ValidTabId, settings);
+
+            // Assert
+            Assert.AreEqual(validTab.TabID, tab.TabID);
+        }
+
+        [Test]
+        public void GetActiveTab_Gets_Correct_Tab_If_Valid_Host_TabId()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = HostTabId, PortalID = HostPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(HostTabId, settings);
+
+            // Assert
+            Assert.AreEqual(validTab.TabID, tab.TabID);
+        }
+
+        [Test]
+        public void GetActiveTab_Gets_Splash_Tab_If_InValid_TabId_And_SplashTab_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, SplashTabId = SplashTabId, CultureCode = Null.NullString };
+            var splashTabId = new TabInfo { TabID = SplashTabId, PortalID = ValidPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { splashTabId }));
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(InValidTabId, settings);
+
+            // Assert
+            Assert.AreEqual(SplashTabId, tab.TabID);
+        }
+
+        [Test]
+        public void GetActiveTab_Gets_Home_Tab_If_InValid_TabId_And_Home_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, HomeTabId = HomeTabId, CultureCode = Null.NullString };
+            var homeTabId = new TabInfo { TabID = HomeTabId, PortalID = ValidPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { homeTabId }));
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(InValidTabId, settings);
+
+            // Assert
+            Assert.AreEqual(HomeTabId, tab.TabID);
+        }
+
+        [Test]
+        public void GetActiveTab_Gets_Splash_Tab_If_InValid_TabId_And_Both_HomeTab_And_SplashTab_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, SplashTabId = SplashTabId, HomeTabId = HomeTabId, CultureCode = Null.NullString };
+            var splashTabId = new TabInfo { TabID = SplashTabId, PortalID = ValidPortalId };
+            var homeTabId = new TabInfo { TabID = HomeTabId, PortalID = ValidPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(ValidPortalId)).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { splashTabId, homeTabId }));
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(InValidTabId, settings);
+
+            // Assert
+            Assert.AreEqual(SplashTabId, tab.TabID);
+        }
+
+        [Test]
+        public void GetActiveTab_Sets_StartDate_And_EndDate_Of_Tab_If_Not_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            var tab = controller.GetActiveTab(ValidTabId, settings);
+
+            // Assert
+            Assert.AreEqual(DateTime.MinValue, tab.StartDate);
+            Assert.AreEqual(DateTime.MaxValue, tab.EndDate);
+        }
+
+        [Test]
+        public void ConfigureTab_Uses_PortalSettings_DefaultSkin_If_SkinSrc_Not_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
+            settings.ActiveTab = validTab;
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalSkin")).Returns(DefaultSkin);
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(DefaultSkin, settings.ActiveTab.SkinSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Uses_Tab_SkinSrc_If_SkinSrc_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = TabSkin };
+            settings.ActiveTab = validTab;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(TabSkin, settings.ActiveTab.SkinSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Formats_Tab_SkinSrc_If_Neccessary()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalSkin = DefaultSkin, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = GlobalTabSkin };
+            settings.ActiveTab = validTab;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(SkinController.FormatSkinSrc(GlobalTabSkin, settings), settings.ActiveTab.SkinSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Uses_PortalSettings_DefaultContainer_If_ContainerSrc_Not_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId };
+            settings.ActiveTab = validTab;
+            settings.ActiveTab.SkinSrc = TabSkin;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(DefaultContainer, settings.ActiveTab.ContainerSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Uses_Tab_ContainerSrc_If_ContainerSrc_Set()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ContainerSrc = TabContainer };
+            settings.ActiveTab = validTab;
+            settings.ActiveTab.SkinSrc = TabSkin;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(TabContainer, settings.ActiveTab.ContainerSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Formats_Tab_ContainerSrc_If_Neccessary()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, DefaultPortalContainer = DefaultContainer, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ContainerSrc = GlobalTabContainer };
+            settings.ActiveTab = validTab;
+            settings.ActiveTab.SkinSrc = TabSkin;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.AreEqual(SkinController.FormatSkinSrc(GlobalTabContainer, settings), settings.ActiveTab.ContainerSrc);
+        }
+
+        [Test]
+        public void ConfigureTab_Builds_Breadcrumbs_For_Tab()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, SkinSrc = GlobalTabSkin };
+            settings.ActiveTab = validTab;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            Assert.NotNull(settings.ActiveTab.BreadCrumbs);
+            Assert.AreEqual(1, settings.ActiveTab.BreadCrumbs.Count);
+        }
+
+        [Test]
+        public void ConfigureTab_Builds_Breadcrumbs_For_Tab_And_Parent()
+        {
+            // Arrange
+            var controller = new PortalSettingsController();
+            var settings = new PortalSettings { PortalId = ValidPortalId, CultureCode = Null.NullString };
+            var validTab = new TabInfo { TabID = ValidTabId, PortalID = ValidPortalId, ParentId = ParentTabId };
+            var parentTab = new TabInfo { TabID = ParentTabId, PortalID = ValidPortalId };
+            settings.ActiveTab = validTab;
+            settings.ActiveTab.SkinSrc = TabSkin;
+
+            var mockLocaleController = new Mock<ILocaleController>();
+            mockLocaleController.Setup(c => c.GetLocales(It.IsAny<int>())).Returns(new Dictionary<string, Locale>());
+            LocaleController.RegisterInstance(mockLocaleController.Object);
+
+            var mockTabController = new Mock<ITabController>();
+            mockTabController.Setup(c => c.GetTabsByPortal(ValidPortalId)).Returns(new TabCollection(new List<TabInfo> { validTab, parentTab }));
+            mockTabController.Setup(c => c.GetTabsByPortal(HostPortalId)).Returns(new TabCollection());
+            TabController.SetTestableInstance(mockTabController.Object);
+
+            this.mockHostController.Setup(c => c.GetString("DefaultPortalContainer")).Returns("DefaultPortalContainer");
+
+            // Act
+            controller.ConfigureActiveTab(settings);
+
+            // Assert
+            var actualParent = settings.ActiveTab.BreadCrumbs[0] as TabInfo;
+            var actualTab = settings.ActiveTab.BreadCrumbs[1] as TabInfo;
+            Assert.AreEqual(2, settings.ActiveTab.BreadCrumbs.Count);
+            Assert.AreEqual(ValidTabId, actualTab.TabID);
+            Assert.AreEqual(ParentTabId, actualParent.TabID);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileContentTypeManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileContentTypeManagerTests.cs
index 5b917da70d9..1a2dc6d3357 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileContentTypeManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileContentTypeManagerTests.cs	
@@ -2,72 +2,71 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Providers.Folder
+namespace DotNetNuke.Tests.Core.Providers.Folder
 {
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
-    using DotNetNuke.Common.Internal;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Services.FileSystem;
+    using DotNetNuke.Common.Internal;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.FileSystem;
     using DotNetNuke.Tests.Utilities.Mocks;
-
     using Microsoft.Extensions.DependencyInjection;
-
-    using Moq;
-
-    using NUnit.Framework;
+    using Moq;
+    using NUnit.Framework;
 
-    [TestFixture]
-    public class FileContentTypeManagerTests
-    {
-        [SetUp]
-        public void Setup()
-        {
-            var serviceCollection = new ServiceCollection();
+    [TestFixture]
+    public class FileContentTypeManagerTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var serviceCollection = new ServiceCollection();
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-
-            var _mockData = MockComponentProvider.CreateDataProvider();
-            var _mockCache = MockComponentProvider.CreateDataCacheProvider();
-            var _globals = new Mock<IGlobals>();
-            var _cbo = new Mock<ICBO>();
-
-            _mockData.Setup(m => m.GetProviderPath()).Returns(string.Empty);
-
-            TestableGlobals.SetTestableInstance(_globals.Object);
-            CBO.SetTestableInstance(_cbo.Object);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            TestableGlobals.ClearInstance();
-            CBO.ClearInstance();
-        }
-
-        [Test]
-        public void GetContentType_Returns_Known_Value_When_Extension_Is_Not_Managed()
-        {
-            const string notManagedExtension = "asdf609vas21AS:F,l/&%/(%$";
-
-            var contentType = FileContentTypeManager.Instance.GetContentType(notManagedExtension);
-
-            Assert.AreEqual("application/octet-stream", contentType);
-        }
-
-        [Test]
-        public void GetContentType_Returns_Correct_Value_For_Extension()
-        {
-            const string notManagedExtension = "htm";
-
-            var contentType = FileContentTypeManager.Instance.GetContentType(notManagedExtension);
-
-            Assert.AreEqual("text/html", contentType);
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            var _mockData = MockComponentProvider.CreateDataProvider();
+            var _mockCache = MockComponentProvider.CreateDataCacheProvider();
+            var _globals = new Mock<IGlobals>();
+            var _cbo = new Mock<ICBO>();
+
+            _mockData.Setup(m => m.GetProviderPath()).Returns(string.Empty);
+
+            TestableGlobals.SetTestableInstance(_globals.Object);
+            CBO.SetTestableInstance(_cbo.Object);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            TestableGlobals.ClearInstance();
+            CBO.ClearInstance();
+        }
+
+        [Test]
+        public void GetContentType_Returns_Known_Value_When_Extension_Is_Not_Managed()
+        {
+            const string notManagedExtension = "asdf609vas21AS:F,l/&%/(%$";
+
+            var contentType = FileContentTypeManager.Instance.GetContentType(notManagedExtension);
+
+            Assert.AreEqual("application/octet-stream", contentType);
+        }
+
+        [Test]
+        public void GetContentType_Returns_Correct_Value_For_Extension()
+        {
+            const string notManagedExtension = "htm";
+
+            var contentType = FileContentTypeManager.Instance.GetContentType(notManagedExtension);
+
+            Assert.AreEqual("text/html", contentType);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileManagerTests.cs
index 71c5b655c57..70c8d21367b 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FileManagerTests.cs	
@@ -2,1125 +2,1136 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Providers.Folder
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.Drawing;
-    using System.IO;
-    using System.Reflection;
-    using System.Text;
-
-    using DotNetNuke.Common.Internal;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Content;
-    using DotNetNuke.Entities.Content.Workflow;
-    using DotNetNuke.Entities.Content.Workflow.Entities;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Security.Permissions;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.FileSystem;
-    using DotNetNuke.Services.FileSystem.Internal;
-    using DotNetNuke.Services.Log.EventLog;
-    using DotNetNuke.Tests.Utilities;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
-
-    [TestFixture]
-    public class FileManagerTests
-    {
-        private FileManager _fileManager;
-        private Mock<IFolderManager> _folderManager;
-        private Mock<IFolderPermissionController> _folderPermissionController;
-        private Mock<IPortalController> _portalController;
-        private Mock<IFolderMappingController> _folderMappingController;
-        private Mock<IGlobals> _globals;
-        private Mock<ICBO> _cbo;
-        private Mock<DataProvider> _mockData;
-        private Mock<FolderProvider> _mockFolder;
-        private Mock<CachingProvider> _mockCache;
-        private Mock<FileManager> _mockFileManager;
-        private Mock<IFolderInfo> _folderInfo;
-        private Mock<IFileInfo> _fileInfo;
-        private Mock<IPathUtils> _pathUtils;
-        private Mock<IFileVersionController> _fileVersionController;
-        private Mock<IWorkflowManager> _workflowManager;
-        private Mock<IEventHandlersContainer<IFileEventHandlers>> _fileEventHandlersContainer;
-        private Mock<IFileLockingController> _mockFileLockingController;
-        private Mock<IFileDeletionController> _mockFileDeletionController;
-        private Mock<IHostController> _hostController;
-
-        [SetUp]
-        public void Setup()
-        {
-            this._mockData = MockComponentProvider.CreateDataProvider();
-            this._mockFolder = MockComponentProvider.CreateFolderProvider(Constants.FOLDER_ValidFolderProviderType);
-            this._mockCache = MockComponentProvider.CreateDataCacheProvider();
-
-            this._folderManager = new Mock<IFolderManager>();
-            this._folderPermissionController = new Mock<IFolderPermissionController>();
-            this._portalController = new Mock<IPortalController>();
-            this._hostController = new Mock<IHostController>();
-            this._folderMappingController = new Mock<IFolderMappingController>();
-            this._fileVersionController = new Mock<IFileVersionController>();
-            this._workflowManager = new Mock<IWorkflowManager>();
-            this._fileEventHandlersContainer = new Mock<IEventHandlersContainer<IFileEventHandlers>>();
-            this._globals = new Mock<IGlobals>();
-            this._cbo = new Mock<ICBO>();
-            this._pathUtils = new Mock<IPathUtils>();
-            this._mockFileLockingController = new Mock<IFileLockingController>();
-            this._mockFileDeletionController = new Mock<IFileDeletionController>();
-
-            EventLogController.SetTestableInstance(Mock.Of<IEventLogController>());
-            FolderManager.RegisterInstance(this._folderManager.Object);
-            FolderPermissionController.SetTestableInstance(this._folderPermissionController.Object);
-            PortalController.SetTestableInstance(this._portalController.Object);
-            HostController.RegisterInstance(this._hostController.Object);
-            FolderMappingController.RegisterInstance(this._folderMappingController.Object);
-            TestableGlobals.SetTestableInstance(this._globals.Object);
-            CBO.SetTestableInstance(this._cbo.Object);
-            PathUtils.RegisterInstance(this._pathUtils.Object);
-            FileVersionController.RegisterInstance(this._fileVersionController.Object);
-            WorkflowManager.SetTestableInstance(this._workflowManager.Object);
-            EventHandlersContainer<IFileEventHandlers>.RegisterInstance(this._fileEventHandlersContainer.Object);
-            this._mockFileManager = new Mock<FileManager> { CallBase = true };
-
-            this._folderInfo = new Mock<IFolderInfo>();
-            this._fileInfo = new Mock<IFileInfo>();
-
-            this._fileManager = new FileManager();
-
-            FileLockingController.SetTestableInstance(this._mockFileLockingController.Object);
-            FileDeletionController.SetTestableInstance(this._mockFileDeletionController.Object);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            TestableGlobals.ClearInstance();
-            CBO.ClearInstance();
-
-            FolderPermissionController.ClearInstance();
-            FileLockingController.ClearInstance();
-            FileDeletionController.ClearInstance();
-            MockComponentProvider.ResetContainer();
-            PortalController.ClearInstance();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void AddFile_Throws_On_Null_Folder()
-        {
-            this._fileManager.AddFile(null, It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void AddFile_Throws_On_Null_Or_Empty_FileName(string fileName)
-        {
-            this._fileManager.AddFile(this._folderInfo.Object, fileName, It.IsAny<Stream>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void AddFile_Throws_On_Null_FileContent()
-        {
-            this._fileManager.AddFile(this._folderInfo.Object, It.IsAny<string>(), null, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(PermissionsNotMetException))]
-        public void AddFile_Throws_When_Permissions_Are_Not_Met()
-        {
-            this._folderPermissionController.Setup(fpc => fpc.CanAddFolder(this._folderInfo.Object)).Returns(false);
-
-            this._fileManager.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, new MemoryStream(), It.IsAny<bool>(), true, It.IsAny<string>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(NoSpaceAvailableException))]
-        public void AddFile_Throws_When_Portal_Has_No_Space_Available()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockData.Setup(c => c.GetProviderPath()).Returns(string.Empty);
-
-            var fileContent = new MemoryStream();
-
-            this._globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(false);
-
-            this._mockFileManager.Setup(fm => fm.CreateFileContentItem()).Returns(new ContentItem());
-            this._mockFileManager.Setup(fm => fm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
-
-            this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
-        }
-
-        [Test]
-        public void AddFile_Checks_Space_For_Stream_Length()
-        {
-            // Arrange
-            this.PrepareFileSecurityCheck();
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.WorkflowID).Returns(Null.NullInteger);
-
-            var fileContent = new MemoryStream(Encoding.ASCII.GetBytes("some data here"));
-
-            this._portalController.Setup(pc => pc.HasSpaceAvailable(It.IsAny<int>(), It.IsAny<long>())).Returns(true);
-
-            this._globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(false);
-            this._mockFolder.Setup(mf => mf.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent)).Verifiable();
-
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
-            this._mockFileManager.Setup(mfm => mfm.CreateFileContentItem()).Returns(new ContentItem());
-            this._mockFileManager.Setup(mfm => mfm.IsImageFile(It.IsAny<IFileInfo>())).Returns(false);
-
-            this._workflowManager.Setup(we => we.GetWorkflow(It.IsAny<int>())).Returns((Workflow)null);
-
-            // Act
-            this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, true, false, Constants.CONTENTTYPE_ValidContentType);
-
-            // Assert
-            this._portalController.Verify(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length));
-        }
-
-        [Test]
-        [ExpectedException(typeof(InvalidFileExtensionException))]
-        public void AddFile_Throws_When_Extension_Is_Invalid()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-
-            var fileContent = new MemoryStream();
-
-            this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
-
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(false);
-
-            this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
-        }
-
-        [TestCase("invalid_script.svg")]
-        [TestCase("invalid_onload.svg")]
-        [TestCase("invalid_onerror.svg")]
-        [ExpectedException(typeof(InvalidFileContentException))]
-        public void AddFile_Throws_When_File_Content_Is_Invalid(string fileName)
-        {
-            this.PrepareFileSecurityCheck();
-
-            using (var fileContent = File.OpenRead(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources\\{fileName}")))
-            {
-                this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
-                this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidSvgFileName)).Returns(true);
-
-                this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidSvgFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
-            }
-        }
-
-        [Test]
-        public void AddFile_No_Error_When_File_Content_Is_Valid()
-        {
-            this.PrepareFileSecurityCheck();
-
-            using (var fileContent = File.OpenRead(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources\\valid.svg")))
-            {
-                this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
-                this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidSvgFileName)).Returns(true);
-                this._mockFileManager.Setup(mfm => mfm.IsImageFile(It.IsAny<IFileInfo>())).Returns(false);
-
-                this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidSvgFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
-            }
-        }
-
-        [Test]
-        public void AddFile_Does_Not_Call_FolderProvider_AddFile_When_Not_Overwritting_And_File_Exists()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.WorkflowID).Returns(Null.NullInteger);
-
-            var fileContent = new MemoryStream();
-
-            this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
-
-            this._globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true);
-            this._mockFolder.Setup(mf => mf.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent));
-            this._mockFolder.Setup(mf => mf.GetHashCode(It.IsAny<IFileInfo>())).Returns("aaa");
-
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
-            this._mockFileManager.Setup(mfm => mfm.UpdateFile(It.IsAny<IFileInfo>(), It.IsAny<Stream>()));
-            this._mockFileManager.Setup(mfm => mfm.CreateFileContentItem()).Returns(new ContentItem());
-
-            this._workflowManager.Setup(wc => wc.GetWorkflow(It.IsAny<int>())).Returns((Workflow)null);
-
-            this._mockData.Setup(
-                md =>
-                md.AddFile(
-                    It.IsAny<int>(),
-                    It.IsAny<Guid>(),
-                    It.IsAny<Guid>(),
-                    It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<long>(),
-                    It.IsAny<int>(),
-                    It.IsAny<int>(),
-                    It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<int>(),
-                    It.IsAny<int>(),
-                    It.IsAny<string>(),
-                    It.IsAny<DateTime>(),
-                    It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<DateTime>(),
-                    It.IsAny<DateTime>(),
-                    It.IsAny<bool>(),
-                    It.IsAny<int>()))
-               .Returns(Constants.FOLDER_ValidFileId);
-
-            this._mockData.Setup(md => md.UpdateFileLastModificationTime(It.IsAny<int>(), It.IsAny<DateTime>()));
-
-            this._mockFileManager.Object.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
-
-            this._mockFolder.Verify(mf => mf.AddFile(It.IsAny<IFolderInfo>(), It.IsAny<string>(), It.IsAny<Stream>()), Times.Never());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void CopyFile_Throws_On_Null_File()
-        {
-            this._fileManager.CopyFile(null, this._folderInfo.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void CopyFile_Throws_On_Null_DestinationFolder()
-        {
-            this._fileManager.CopyFile(this._fileInfo.Object, null);
-        }
-
-        [Test]
-        public void CopyFile_Calls_FileManager_AddFile_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Not_Equal()
-        {
-            const int sourceFolderMappingID = Constants.FOLDER_ValidFolderMappingID;
-            const int destinationFolderMappingID = Constants.FOLDER_ValidFolderMappingID + 1;
-
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.ContentType).Returns(Constants.CONTENTTYPE_ValidContentType);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(sourceFolderMappingID);
-
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(destinationFolderMappingID);
-
-            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-            var fileContent = new MemoryStream(bytes);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFileContent(this._fileInfo.Object)).Returns(fileContent);
-            this._mockFileManager.Setup(mfm => mfm.CopyContentItem(It.IsAny<int>())).Returns(Constants.CONTENT_ValidContentItemId);
-            this._mockFileManager.Setup(mfm => mfm.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<Stream>(), true, true, Constants.CONTENTTYPE_ValidContentType));
-
-            this._mockFileManager.Object.CopyFile(this._fileInfo.Object, this._folderInfo.Object);
-
-            this._mockFileManager.Verify(fm => fm.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, true, true, Constants.CONTENTTYPE_ValidContentType), Times.Once());
-        }
-
-        [Test]
-        [ExpectedException(typeof(PermissionsNotMetException))]
-        public void CopyFile_Throws_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Equal_And_Cannot_Add_Folder()
-        {
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanAddFolder(this._folderInfo.Object)).Returns(false);
-
-            this._fileManager.CopyFile(this._fileInfo.Object, this._folderInfo.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(NoSpaceAvailableException))]
-        public void CopyFile_Throws_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Equal_And_Portal_Has_No_Space_Available()
-        {
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._fileInfo.Setup(fi => fi.Size).Returns(Constants.FOLDER_ValidFileSize);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanAddFolder(this._folderInfo.Object)).Returns(true);
-            this._portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFileSize)).Returns(false);
-
-            this._fileManager.CopyFile(this._fileInfo.Object, this._folderInfo.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void DeleteFile_Throws_On_Null_File()
-        {
-            this._fileManager.DeleteFile(null);
-        }
-
-        [Test]
-        public void DeleteFile_Calls_FileDeletionControllerDeleteFile()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(this._fileInfo.Object)).Verifiable();
-
-            this._mockFileManager.Object.DeleteFile(this._fileInfo.Object);
-
-            this._mockFileDeletionController.Verify();
-        }
-
-        [Test]
-        [ExpectedException(typeof(FolderProviderException))]
-        public void DeleteFile_Throws_WhenFileDeletionControllerThrows()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(this._fileInfo.Object))
-                                       .Throws<FolderProviderException>();
-
-            this._mockFileManager.Object.DeleteFile(this._fileInfo.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void DownloadFile_Throws_On_Null_File()
-        {
-            this._fileManager.WriteFileToResponse(null, ContentDisposition.Inline);
-        }
-
-        [Test]
-        [ExpectedException(typeof(PermissionsNotMetException))]
-        public void DownloadFile_Throws_When_Permissions_Are_Not_Met()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanViewFolder(this._folderInfo.Object)).Returns(false);
-
-            this._fileManager.WriteFileToResponse(this._fileInfo.Object, ContentDisposition.Inline);
-        }
-
-        [Test]
-        public void DownloadFile_Calls_FileManager_AutoSyncFile_When_File_AutoSync_Is_Enabled()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanViewFolder(this._folderInfo.Object)).Returns(true);
-
-            this._mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(true);
-            this._mockFileManager.Setup(mfm => mfm.AutoSyncFile(this._fileInfo.Object)).Verifiable();
-            this._mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this._fileInfo.Object, It.IsAny<ContentDisposition>()));
-
-            this._mockFileManager.Object.WriteFileToResponse(this._fileInfo.Object, ContentDisposition.Inline);
-
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        public void DownloadFile_Does_Not_Call_FileManager_AutoSyncFile_When_File_AutoSync_Is_Not_Enabled()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanViewFolder(this._folderInfo.Object)).Returns(true);
-
-            this._mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this._fileInfo.Object, It.IsAny<ContentDisposition>()));
-
-            this._mockFileManager.Object.WriteFileToResponse(this._fileInfo.Object, ContentDisposition.Inline);
-
-            this._mockFileManager.Verify(mfm => mfm.AutoSyncFile(this._fileInfo.Object), Times.Never());
-        }
-
-        [Test]
-        public void DownloadFile_Calls_FileManager_WriteBytesToHttpContext()
-        {
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._folderPermissionController.Setup(fpc => fpc.CanViewFolder(this._folderInfo.Object)).Returns(true);
-
-            this._mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this._fileInfo.Object, It.IsAny<ContentDisposition>())).Verifiable();
-
-            this._mockFileManager.Object.WriteFileToResponse(this._fileInfo.Object, ContentDisposition.Inline);
-
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void ExistsFile_Throws_On_Null_Folder()
-        {
-            this._fileManager.FileExists(null, It.IsAny<string>());
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void ExistsFile_Throws_On_Null_Or_Empty_FileName(string fileName)
-        {
-            this._fileManager.FileExists(this._folderInfo.Object, fileName);
-        }
-
-        [Test]
-        public void ExistsFile_Calls_FileManager_GetFile()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns<IFileInfo>(null).Verifiable();
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFileManager.Object.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        public void ExistsFile_Calls_FolderProvider_ExistsFile()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this._fileInfo.Object);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true).Verifiable();
-
-            this._mockFileManager.Object.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-
-            this._mockFolder.Verify();
-        }
-
-        [Test]
-        public void ExistsFile_Returns_True_When_File_Exists()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this._fileInfo.Object);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true);
-
-            var result = this._mockFileManager.Object.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void ExistsFile_Returns_False_When_File_Does_Not_Exist()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this._fileInfo.Object);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(false);
-
-            var result = this._mockFileManager.Object.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        [ExpectedException(typeof(FolderProviderException))]
-        public void ExistsFile_Throws_When_FolderProvider_Throws()
-        {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this._fileInfo.Object);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName)).Throws<Exception>();
-
-            this._mockFileManager.Object.FileExists(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void GetFile_Throws_On_Null_Or_Empty_FileName(string fileName)
-        {
-            this._fileManager.GetFile(this._folderInfo.Object, fileName);
-        }
-
-        [Test]
-        public void GetFile_Calls_DataProvider_GetFile()
-        {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
-
-            this._fileManager.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName);
-
-            this._mockData.Verify();
-        }
-
-        [Test]
-        public void GetFile_Handles_Path_In_Portal_Root()
-        {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderManager.Setup(x => x.GetFolder(Constants.CONTENT_ValidPortalId, string.Empty)).Returns(this._folderInfo.Object).Verifiable();
-            this._mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
-
-            this._fileManager.GetFile(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFileName);
-
-            this._folderManager.Verify();
-            this._mockData.Verify();
-        }
-
-        [Test]
-        public void GetFile_Handles_Path_Beyond_Portal_Root()
-        {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderManager.Setup(x => x.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this._folderInfo.Object).Verifiable();
-            this._mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
-
-            this._fileManager.GetFile(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath + Constants.FOLDER_ValidFileName);
-
-            this._folderManager.Verify();
-            this._mockData.Verify();
-        }
-
-        [Test]
-        public void GetFileByID_Does_Not_Call_DataCache_GetCache_If_FileId_Is_Not_Valid()
-        {
-            this._mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(this._fileInfo.Object).Verifiable();
-
-            this._fileManager.GetFile(Constants.FOLDER_InvalidFileId);
-
-            this._mockCache.Verify(mc => mc.GetItem(It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        public void GetFileByID_Calls_DataCache_GetCache_First()
-        {
-            this._mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(this._fileInfo.Object).Verifiable();
-
-            this._fileManager.GetFile(Constants.FOLDER_ValidFileId);
-
-            this._mockCache.Verify();
-        }
-
-        [Test]
-        public void GetFileByID_Calls_DataProvider_GetFileById_When_File_Is_Not_In_Cache()
-        {
-            this._mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(null);
-
-            this._fileManager.GetFile(Constants.FOLDER_ValidFileId);
-
-            this._mockData.Verify(md => md.GetFileById(Constants.FOLDER_ValidFileId, It.IsAny<bool>()), Times.Once());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void MoveFile_Throws_On_Null_File()
-        {
-            this._fileManager.MoveFile(null, this._folderInfo.Object);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void MoveFile_Throws_On_Null_DestinationFolder()
-        {
-            this._fileManager.MoveFile(this._fileInfo.Object, null);
-        }
-
-        [Test]
-        public void MoveFile_Calls_FolderProvider_AddFile_And_DeleteFile_And_FileManager_UpdateFile()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            var fileContent = new MemoryStream();
-
-            this._mockFileManager.Setup(mfm => mfm.GetFileContent(this._fileInfo.Object)).Returns(fileContent);
-            string someString;
-            this._mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this._fileInfo.Object, out someString)).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.MoveVersions(this._fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
-
-            this._mockFolder.Setup(mf => mf.AddFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent)).Verifiable();
-            this._mockFolder.Setup(mf => mf.DeleteFile(this._fileInfo.Object)).Verifiable();
-
-            this._mockFileManager.Setup(mfm => mfm.UpdateFile(this._fileInfo.Object)).Verifiable();
-
-            this._mockFileManager.Object.MoveFile(this._fileInfo.Object, this._folderInfo.Object);
-
-            this._mockFolder.Verify();
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        public void MoveFile_Updates_FolderId_And_Folder()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-            this._fileInfo.Setup(fi => fi.Folder).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._fileInfo.SetupSet(fi => fi.FolderId = Constants.FOLDER_OtherValidFolderId).Verifiable();
-            this._fileInfo.SetupSet(fi => fi.Folder = Constants.FOLDER_OtherValidFolderRelativePath).Verifiable();
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            var fileContent = new MemoryStream();
-
-            this._mockFileManager.Setup(mfm => mfm.GetFileContent(this._fileInfo.Object)).Returns(fileContent);
-            string someString;
-            this._mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this._fileInfo.Object, out someString)).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.MoveVersions(this._fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
-            this._mockFileManager.Object.MoveFile(this._fileInfo.Object, this._folderInfo.Object);
-
-            this._fileInfo.Verify();
-        }
-
-        [Test]
-        public void MoveFile_Calls_DeleteFile_When_A_File_With_The_Same_Name_Exists_On_The_Destination_Folder()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            var fileContent = new MemoryStream();
-
-            this._mockFileManager.Setup(mfm => mfm.GetFileContent(this._fileInfo.Object)).Returns(fileContent);
-            string someString;
-            this._mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this._fileInfo.Object, out someString)).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.MoveVersions(this._fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
-
-            var existingFile = new FileInfo();
-            this._mockFileManager.Setup(mfm => mfm.GetFile(this._folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(existingFile);
-
-            this._mockFileManager.Setup(mfm => mfm.DeleteFile(existingFile)).Verifiable();
-
-            this._mockFileManager.Object.MoveFile(this._fileInfo.Object, this._folderInfo.Object);
-
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RenameFile_Throws_On_Null_File()
-        {
-            this._fileManager.RenameFile(null, It.IsAny<string>());
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [ExpectedException(typeof(ArgumentException))]
-        public void RenameFile_Throws_On_Null_Or_Empty_NewFileName(string newFileName)
-        {
-            this._fileManager.RenameFile(this._fileInfo.Object, newFileName);
-        }
-
-        [Test]
-        public void RenameFile_Calls_FolderProvider_RenameFile_When_FileNames_Are_Distinct_And_NewFileName_Does_Not_Exist()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._mockFileManager.Setup(mfm => mfm.FileExists(this._folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.UpdateFile(this._fileInfo.Object));
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
-
-            var folderMapping = new FolderMappingInfo();
-            folderMapping.FolderProviderType = Constants.FOLDER_ValidFolderProviderType;
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFileManager.Object.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherValidFileName);
-
-            this._mockFolder.Verify(mf => mf.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherValidFileName), Times.Once());
-        }
-
-        [Test]
-        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_FileNames_Are_Equal()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-
-            this._fileManager.RenameFile(this._fileInfo.Object, Constants.FOLDER_ValidFileName);
-
-            this._mockFolder.Verify(mf => mf.RenameFile(this._fileInfo.Object, It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        [ExpectedException(typeof(FileAlreadyExistsException))]
-        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_NewFileName_Exists()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._mockFileManager.Setup(mfm => mfm.FileExists(this._folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(true);
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
-
-            this._mockFileManager.Object.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherValidFileName);
-        }
-
-        [Test]
-        [ExpectedException(typeof(InvalidFileExtensionException))]
-        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_InvalidExtensionType()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-            this._mockFileManager.Setup(fm => fm.IsAllowedExtension(It.IsAny<string>())).Returns(false);
-
-            this._mockFileManager.Object.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherInvalidFileNameExtension);
-        }
-
-        [Test]
-        [ExpectedException(typeof(FolderProviderException))]
-        public void RenameFile_Throws_When_FolderProvider_Throws()
-        {
-            this._fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
-            this._fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
-            this._fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
-            this._fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-
-            this._folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this._folderInfo.Object);
-
-            this._mockFileManager.Setup(mfm => mfm.FileExists(this._folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.UpdateFile(this._fileInfo.Object));
-            this._mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
-
-            var folderMapping = new FolderMappingInfo();
-            folderMapping.FolderProviderType = Constants.FOLDER_ValidFolderProviderType;
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._mockFolder.Setup(mf => mf.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherValidFileName)).Throws<Exception>();
-
-            this._mockFileManager.Object.RenameFile(this._fileInfo.Object, Constants.FOLDER_OtherValidFileName);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void UnzipFile_Throws_On_Null_File()
-        {
-            this._fileManager.UnzipFile(null, It.IsAny<IFolderInfo>());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void UnzipFile_Throws_On_Null_DestinationFolder()
-        {
-            this._fileManager.UnzipFile(It.IsAny<IFileInfo>(), null);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void UnzipFile_Throws_When_File_Extension_Is_Not_Zip()
-        {
-            this._fileInfo.Setup(fi => fi.Extension).Returns("txt");
-
-            this._fileManager.UnzipFile(this._fileInfo.Object, It.IsAny<IFolderInfo>());
-        }
-
-        [Test]
-        public void UnzipFile_Calls_FileManager_ExtractFiles()
-        {
-            this._fileInfo.Setup(fi => fi.Extension).Returns("zip");
-
-            this._mockFileManager.Setup(mfm => mfm.ExtractFiles(this._fileInfo.Object, this._folderInfo.Object, null)).Verifiable();
-
-            this._mockFileManager.Object.UnzipFile(this._fileInfo.Object, this._folderInfo.Object);
-
-            this._mockFileManager.Verify();
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void UpdateFile_Throws_On_Null_File()
-        {
-            this._fileManager.UpdateFile(null);
-        }
-
-        [Test]
-        public void UpdateFile_Calls_DataProvider_UpdateFile()
-        {
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-            this._mockFileManager.Object.UpdateFile(this._fileInfo.Object);
-
-            this._mockData.Verify(
-                md => md.UpdateFile(
-                It.IsAny<int>(),
-                It.IsAny<Guid>(),
-                It.IsAny<string>(),
-                It.IsAny<string>(),
-                It.IsAny<long>(),
-                It.IsAny<int>(),
-                It.IsAny<int>(),
-                It.IsAny<string>(),
-                It.IsAny<int>(),
-                It.IsAny<int>(),
-                It.IsAny<string>(),
-                It.IsAny<DateTime>(),
-                It.IsAny<string>(),
-                It.IsAny<string>(),
-                It.IsAny<DateTime>(),
-                It.IsAny<DateTime>(),
-                It.IsAny<bool>(),
-                It.IsAny<int>()),
-                Times.Once());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void UpdateFile_Throws_On_Null_File_Overload()
-        {
-            this._fileManager.UpdateFile(null, It.IsAny<Stream>());
-        }
-
-        [Test]
-        public void UpdateFile_Sets_With_And_Height_When_File_Is_Image()
-        {
-            var image = new Bitmap(10, 20);
-
-            this._mockFileManager.Setup(mfm => mfm.IsImageFile(this._fileInfo.Object)).Returns(true);
-            this._mockFileManager.Setup(mfm => mfm.GetImageFromStream(It.IsAny<Stream>())).Returns(image);
-            this._mockFileManager.Setup(mfm => mfm.GetHash(this._fileInfo.Object));
-
-            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-            var stream = new MemoryStream(bytes);
-
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-
-            this._folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
-            this._mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
-
-            this._mockFileManager.Object.UpdateFile(this._fileInfo.Object, stream);
-
-            this._fileInfo.VerifySet(fi => fi.Width = 10);
-            this._fileInfo.VerifySet(fi => fi.Height = 20);
-        }
-
-        [Test]
-        public void UpdateFile_Sets_SHA1Hash()
-        {
-            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-            var stream = new MemoryStream(bytes);
-
-            this._mockFileManager.Setup(mfm => mfm.IsImageFile(this._fileInfo.Object)).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.GetHash(stream)).Returns(Constants.FOLDER_UnmodifiedFileHash);
-
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-
-            this._folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
-            this._mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
-
-            this._mockFileManager.Object.UpdateFile(this._fileInfo.Object, stream);
-
-            this._fileInfo.VerifySet(fi => fi.SHA1Hash = Constants.FOLDER_UnmodifiedFileHash);
-        }
-
-        [Test]
-        public void UpdateFile_Calls_FileManager_UpdateFile_Overload()
-        {
-            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-            var stream = new MemoryStream(bytes);
-
-            this._mockFileManager.Setup(mfm => mfm.IsImageFile(this._fileInfo.Object)).Returns(false);
-            this._mockFileManager.Setup(mfm => mfm.GetHash(this._fileInfo.Object)).Returns(Constants.FOLDER_UnmodifiedFileHash);
-
-            this._fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
-
-            this._folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
-            this._mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
-
-            this._mockFileManager.Object.UpdateFile(this._fileInfo.Object, stream);
-
-            this._mockFileManager.Verify(mfm => mfm.UpdateFile(this._fileInfo.Object), Times.Once());
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void GetSeekableStream_Throws_On_Null_Stream()
-        {
-            this._fileManager.GetSeekableStream(null);
-        }
-
-        [Test]
-        public void GetSeekableStream_Returns_The_Same_Stream_If_It_Is_Seekable()
-        {
-            var inputStream = new MemoryStream();
-            var seekableStream = this._fileManager.GetSeekableStream(inputStream);
-
-            Assert.AreEqual(inputStream, seekableStream);
-        }
-
-        [Test]
-        public void GetSeekableStream_Calls_GetHostMapPath_And_Creates_A_Temporary_FileStream_With_Resx_Extension()
-        {
-            var inputStream = new Mock<Stream>();
-            inputStream.Setup(s => s.CanSeek).Returns(false);
-            inputStream.Setup(s => s.Read(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>())).Returns(0);
-
-            this._mockFileManager.Setup(mfm => mfm.GetHostMapPath()).Returns(string.Empty).Verifiable();
-            this._mockFileManager.Setup(mfm => mfm.GetAutoDeleteFileStream(It.Is((string x) => x.EndsWith(".resx")))).Returns(new MemoryStream()).Verifiable();
-
-            this._mockFileManager.Object.GetSeekableStream(inputStream.Object);
-
-            this._mockFileManager.Verify();
-        }
-
-        private void PrepareFileSecurityCheck()
-        {
-            this._mockData.Setup(p => p.GetListEntriesByListName("FileSecurityChecker", string.Empty, Null.NullInteger)).Returns(() =>
-            {
-                var dataTable = new DataTable();
-                dataTable.Columns.Add("EntryID", typeof(int));
-                dataTable.Columns.Add("ListName", typeof(string));
-                dataTable.Columns.Add("Value", typeof(string));
-                dataTable.Columns.Add("Text", typeof(string));
-                dataTable.Columns.Add("Level", typeof(int));
-                dataTable.Columns.Add("SortOrder", typeof(int));
-                dataTable.Columns.Add("DefinitionID", typeof(int));
-                dataTable.Columns.Add("ParentID", typeof(int));
-                dataTable.Columns.Add("Description", typeof(string));
-                dataTable.Columns.Add("PortalID", typeof(int));
-                dataTable.Columns.Add("SystemList", typeof(bool));
-                dataTable.Columns.Add("ParentKey", typeof(string));
-                dataTable.Columns.Add("Parent", typeof(string));
-                dataTable.Columns.Add("ParentList", typeof(string));
-                dataTable.Columns.Add("MaxSortOrder", typeof(int));
-                dataTable.Columns.Add("EntryCount", typeof(int));
-                dataTable.Columns.Add("HasChildren", typeof(int));
-                dataTable.Columns.Add("CreatedByUserID", typeof(int));
-                dataTable.Columns.Add("CreatedOnDate", typeof(DateTime));
-                dataTable.Columns.Add("LastModifiedByUserID", typeof(int));
-                dataTable.Columns.Add("LastModifiedOnDate", typeof(DateTime));
-
-                dataTable.Rows.Add(1, "FileSecurityChecker", "svg",
-                    "DotNetNuke.Services.FileSystem.Internal.SecurityCheckers.SvgFileChecker, DotNetNuke",
-                    0, 0, -1, -0, string.Empty, -1, 1, string.Empty, string.Empty, string.Empty, 0, 1, 0, -1, DateTime.Now, -1, DateTime.Now);
-
-                return dataTable.CreateDataReader();
-            });
-            this._hostController.Setup(c => c.GetString("PerformanceSetting")).Returns("NoCaching");
-            this._globals.Setup(g => g.HostMapPath).Returns(AppDomain.CurrentDomain.BaseDirectory);
-
-            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
-        }
-
-        private class UnSeekableStream : MemoryStream
-        {
-            public override bool CanSeek
-            {
-                get { return false; }
-            }
-        }
-    }
-}
+namespace DotNetNuke.Tests.Core.Providers.Folder
+{
+    using System;
+    using System.Data;
+    using System.Drawing;
+    using System.IO;
+    using System.Text;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Internal;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Content;
+    using DotNetNuke.Entities.Content.Workflow;
+    using DotNetNuke.Entities.Content.Workflow.Entities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Security.Permissions;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.FileSystem;
+    using DotNetNuke.Services.FileSystem.Internal;
+    using DotNetNuke.Services.Log.EventLog;
+    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
+    [TestFixture]
+    public class FileManagerTests
+    {
+        private FileManager fileManager;
+        private Mock<IFolderManager> folderManager;
+        private Mock<IFolderPermissionController> folderPermissionController;
+        private Mock<IPortalController> portalController;
+        private Mock<IFolderMappingController> folderMappingController;
+        private Mock<IGlobals> globals;
+        private Mock<ICBO> cbo;
+        private Mock<DataProvider> mockData;
+        private Mock<FolderProvider> mockFolder;
+        private Mock<CachingProvider> mockCache;
+        private Mock<FileManager> mockFileManager;
+        private Mock<IFolderInfo> folderInfo;
+        private Mock<IFileInfo> fileInfo;
+        private Mock<IPathUtils> pathUtils;
+        private Mock<IFileVersionController> fileVersionController;
+        private Mock<IWorkflowManager> workflowManager;
+        private Mock<IEventHandlersContainer<IFileEventHandlers>> fileEventHandlersContainer;
+        private Mock<IFileLockingController> mockFileLockingController;
+        private Mock<IFileDeletionController> mockFileDeletionController;
+        private Mock<IHostController> hostController;
+
+        [SetUp]
+        public void Setup()
+        {
+            this.mockData = MockComponentProvider.CreateDataProvider();
+            this.mockFolder = MockComponentProvider.CreateFolderProvider(Constants.FOLDER_ValidFolderProviderType);
+            this.mockCache = MockComponentProvider.CreateDataCacheProvider();
+
+            this.folderManager = new Mock<IFolderManager>();
+            this.folderPermissionController = new Mock<IFolderPermissionController>();
+            this.portalController = new Mock<IPortalController>();
+            this.hostController = new Mock<IHostController>();
+            this.hostController.As<IHostSettingsService>();
+            this.folderMappingController = new Mock<IFolderMappingController>();
+            this.fileVersionController = new Mock<IFileVersionController>();
+            this.workflowManager = new Mock<IWorkflowManager>();
+            this.fileEventHandlersContainer = new Mock<IEventHandlersContainer<IFileEventHandlers>>();
+            this.globals = new Mock<IGlobals>();
+            this.cbo = new Mock<ICBO>();
+            this.pathUtils = new Mock<IPathUtils>();
+            this.mockFileLockingController = new Mock<IFileLockingController>();
+            this.mockFileDeletionController = new Mock<IFileDeletionController>();
+
+            EventLogController.SetTestableInstance(Mock.Of<IEventLogController>());
+            FolderManager.RegisterInstance(this.folderManager.Object);
+            FolderPermissionController.SetTestableInstance(this.folderPermissionController.Object);
+            PortalController.SetTestableInstance(this.portalController.Object);
+            FolderMappingController.RegisterInstance(this.folderMappingController.Object);
+            TestableGlobals.SetTestableInstance(this.globals.Object);
+            CBO.SetTestableInstance(this.cbo.Object);
+            PathUtils.RegisterInstance(this.pathUtils.Object);
+            FileVersionController.RegisterInstance(this.fileVersionController.Object);
+            WorkflowManager.SetTestableInstance(this.workflowManager.Object);
+            EventHandlersContainer<IFileEventHandlers>.RegisterInstance(this.fileEventHandlersContainer.Object);
+            this.mockFileManager = new Mock<FileManager> { CallBase = true };
+
+            this.folderInfo = new Mock<IFolderInfo>();
+            this.fileInfo = new Mock<IFileInfo>();
+
+            this.fileManager = new FileManager();
+
+            FileLockingController.SetTestableInstance(this.mockFileLockingController.Object);
+            FileDeletionController.SetTestableInstance(this.mockFileDeletionController.Object);
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.hostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            TestableGlobals.ClearInstance();
+            CBO.ClearInstance();
+
+            FolderPermissionController.ClearInstance();
+            FileLockingController.ClearInstance();
+            FileDeletionController.ClearInstance();
+            MockComponentProvider.ResetContainer();
+            PortalController.ClearInstance();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void AddFile_Throws_On_Null_Folder()
+        {
+            this.fileManager.AddFile(null, It.IsAny<string>(), It.IsAny<Stream>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void AddFile_Throws_On_Null_Or_Empty_FileName(string fileName)
+        {
+            this.fileManager.AddFile(this.folderInfo.Object, fileName, It.IsAny<Stream>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void AddFile_Throws_On_Null_FileContent()
+        {
+            this.fileManager.AddFile(this.folderInfo.Object, It.IsAny<string>(), null, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<string>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(PermissionsNotMetException))]
+        public void AddFile_Throws_When_Permissions_Are_Not_Met()
+        {
+            this.folderPermissionController.Setup(fpc => fpc.CanAddFolder(this.folderInfo.Object)).Returns(false);
+
+            this.fileManager.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, new MemoryStream(), It.IsAny<bool>(), true, It.IsAny<string>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoSpaceAvailableException))]
+        public void AddFile_Throws_When_Portal_Has_No_Space_Available()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockData.Setup(c => c.GetProviderPath()).Returns(string.Empty);
+
+            var fileContent = new MemoryStream();
+
+            this.globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(false);
+
+            this.mockFileManager.Setup(fm => fm.CreateFileContentItem()).Returns(new ContentItem());
+            this.mockFileManager.Setup(fm => fm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
+
+            this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
+        }
+
+        [Test]
+        public void AddFile_Checks_Space_For_Stream_Length()
+        {
+            // Arrange
+            this.PrepareFileSecurityCheck();
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.WorkflowID).Returns(Null.NullInteger);
+
+            var fileContent = new MemoryStream(Encoding.ASCII.GetBytes("some data here"));
+
+            this.portalController.Setup(pc => pc.HasSpaceAvailable(It.IsAny<int>(), It.IsAny<long>())).Returns(true);
+
+            this.globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(false);
+            this.mockFolder.Setup(mf => mf.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent)).Verifiable();
+
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
+            this.mockFileManager.Setup(mfm => mfm.CreateFileContentItem()).Returns(new ContentItem());
+            this.mockFileManager.Setup(mfm => mfm.IsImageFile(It.IsAny<IFileInfo>())).Returns(false);
+
+            this.workflowManager.Setup(we => we.GetWorkflow(It.IsAny<int>())).Returns((Workflow)null);
+
+            // Act
+            this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, true, false, Constants.CONTENTTYPE_ValidContentType);
+
+            // Assert
+            this.portalController.Verify(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length));
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidFileExtensionException))]
+        public void AddFile_Throws_When_Extension_Is_Invalid()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+
+            var fileContent = new MemoryStream();
+
+            this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
+
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(false);
+
+            this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
+        }
+
+        [TestCase("invalid_script.svg")]
+        [TestCase("invalid_onload.svg")]
+        [TestCase("invalid_onerror.svg")]
+        [ExpectedException(typeof(InvalidFileContentException))]
+        public void AddFile_Throws_When_File_Content_Is_Invalid(string fileName)
+        {
+            this.PrepareFileSecurityCheck();
+
+            using (var fileContent = File.OpenRead(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources\\{fileName}")))
+            {
+                this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
+                this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidSvgFileName)).Returns(true);
+
+                this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidSvgFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
+            }
+        }
+
+        [Test]
+        public void AddFile_No_Error_When_File_Content_Is_Valid()
+        {
+            this.PrepareFileSecurityCheck();
+
+            using (var fileContent = File.OpenRead(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources\\valid.svg")))
+            {
+                this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
+                this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidSvgFileName)).Returns(true);
+                this.mockFileManager.Setup(mfm => mfm.IsImageFile(It.IsAny<IFileInfo>())).Returns(false);
+
+                this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidSvgFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
+            }
+        }
+
+        [Test]
+        public void AddFile_Does_Not_Call_FolderProvider_AddFile_When_Not_Overwritting_And_File_Exists()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.WorkflowID).Returns(Null.NullInteger);
+
+            var fileContent = new MemoryStream();
+
+            this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, fileContent.Length)).Returns(true);
+
+            this.globals.Setup(g => g.GetSubFolderPath(Constants.FOLDER_ValidFilePath, Constants.CONTENT_ValidPortalId)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true);
+            this.mockFolder.Setup(mf => mf.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent));
+            this.mockFolder.Setup(mf => mf.GetHashCode(It.IsAny<IFileInfo>())).Returns("aaa");
+
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_ValidFileName)).Returns(true);
+            this.mockFileManager.Setup(mfm => mfm.UpdateFile(It.IsAny<IFileInfo>(), It.IsAny<Stream>()));
+            this.mockFileManager.Setup(mfm => mfm.CreateFileContentItem()).Returns(new ContentItem());
+
+            this.workflowManager.Setup(wc => wc.GetWorkflow(It.IsAny<int>())).Returns((Workflow)null);
+
+            this.mockData.Setup(
+                md =>
+                md.AddFile(
+                    It.IsAny<int>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<long>(),
+                    It.IsAny<int>(),
+                    It.IsAny<int>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<int>(),
+                    It.IsAny<int>(),
+                    It.IsAny<string>(),
+                    It.IsAny<DateTime>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<DateTime>(),
+                    It.IsAny<DateTime>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<int>()))
+               .Returns(Constants.FOLDER_ValidFileId);
+
+            this.mockData.Setup(md => md.UpdateFileLastModificationTime(It.IsAny<int>(), It.IsAny<DateTime>()));
+
+            this.mockFileManager.Object.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, false, false, Constants.CONTENTTYPE_ValidContentType);
+
+            this.mockFolder.Verify(mf => mf.AddFile(It.IsAny<IFolderInfo>(), It.IsAny<string>(), It.IsAny<Stream>()), Times.Never());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CopyFile_Throws_On_Null_File()
+        {
+            this.fileManager.CopyFile(null, this.folderInfo.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CopyFile_Throws_On_Null_DestinationFolder()
+        {
+            this.fileManager.CopyFile(this.fileInfo.Object, null);
+        }
+
+        [Test]
+        public void CopyFile_Calls_FileManager_AddFile_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Not_Equal()
+        {
+            const int sourceFolderMappingID = Constants.FOLDER_ValidFolderMappingID;
+            const int destinationFolderMappingID = Constants.FOLDER_ValidFolderMappingID + 1;
+
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.ContentType).Returns(Constants.CONTENTTYPE_ValidContentType);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(sourceFolderMappingID);
+
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(destinationFolderMappingID);
+
+            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+            var fileContent = new MemoryStream(bytes);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFileContent(this.fileInfo.Object)).Returns(fileContent);
+            this.mockFileManager.Setup(mfm => mfm.CopyContentItem(It.IsAny<int>())).Returns(Constants.CONTENT_ValidContentItemId);
+            this.mockFileManager.Setup(mfm => mfm.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<Stream>(), true, true, Constants.CONTENTTYPE_ValidContentType));
+
+            this.mockFileManager.Object.CopyFile(this.fileInfo.Object, this.folderInfo.Object);
+
+            this.mockFileManager.Verify(fm => fm.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent, true, true, Constants.CONTENTTYPE_ValidContentType), Times.Once());
+        }
+
+        [Test]
+        [ExpectedException(typeof(PermissionsNotMetException))]
+        public void CopyFile_Throws_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Equal_And_Cannot_Add_Folder()
+        {
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanAddFolder(this.folderInfo.Object)).Returns(false);
+
+            this.fileManager.CopyFile(this.fileInfo.Object, this.folderInfo.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NoSpaceAvailableException))]
+        public void CopyFile_Throws_When_FolderMapping_Of_Source_And_Destination_Folders_Are_Equal_And_Portal_Has_No_Space_Available()
+        {
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.fileInfo.Setup(fi => fi.Size).Returns(Constants.FOLDER_ValidFileSize);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanAddFolder(this.folderInfo.Object)).Returns(true);
+            this.portalController.Setup(pc => pc.HasSpaceAvailable(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFileSize)).Returns(false);
+
+            this.fileManager.CopyFile(this.fileInfo.Object, this.folderInfo.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void DeleteFile_Throws_On_Null_File()
+        {
+            this.fileManager.DeleteFile(null);
+        }
+
+        [Test]
+        public void DeleteFile_Calls_FileDeletionControllerDeleteFile()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(this.fileInfo.Object)).Verifiable();
+
+            this.mockFileManager.Object.DeleteFile(this.fileInfo.Object);
+
+            this.mockFileDeletionController.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(FolderProviderException))]
+        public void DeleteFile_Throws_WhenFileDeletionControllerThrows()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(this.fileInfo.Object))
+                                       .Throws<FolderProviderException>();
+
+            this.mockFileManager.Object.DeleteFile(this.fileInfo.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void DownloadFile_Throws_On_Null_File()
+        {
+            this.fileManager.WriteFileToResponse(null, ContentDisposition.Inline);
+        }
+
+        [Test]
+        [ExpectedException(typeof(PermissionsNotMetException))]
+        public void DownloadFile_Throws_When_Permissions_Are_Not_Met()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanViewFolder(this.folderInfo.Object)).Returns(false);
+
+            this.fileManager.WriteFileToResponse(this.fileInfo.Object, ContentDisposition.Inline);
+        }
+
+        [Test]
+        public void DownloadFile_Calls_FileManager_AutoSyncFile_When_File_AutoSync_Is_Enabled()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanViewFolder(this.folderInfo.Object)).Returns(true);
+
+            this.mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(true);
+            this.mockFileManager.Setup(mfm => mfm.AutoSyncFile(this.fileInfo.Object)).Verifiable();
+            this.mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this.fileInfo.Object, It.IsAny<ContentDisposition>()));
+
+            this.mockFileManager.Object.WriteFileToResponse(this.fileInfo.Object, ContentDisposition.Inline);
+
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        public void DownloadFile_Does_Not_Call_FileManager_AutoSyncFile_When_File_AutoSync_Is_Not_Enabled()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanViewFolder(this.folderInfo.Object)).Returns(true);
+
+            this.mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this.fileInfo.Object, It.IsAny<ContentDisposition>()));
+
+            this.mockFileManager.Object.WriteFileToResponse(this.fileInfo.Object, ContentDisposition.Inline);
+
+            this.mockFileManager.Verify(mfm => mfm.AutoSyncFile(this.fileInfo.Object), Times.Never());
+        }
+
+        [Test]
+        public void DownloadFile_Calls_FileManager_WriteBytesToHttpContext()
+        {
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.folderPermissionController.Setup(fpc => fpc.CanViewFolder(this.folderInfo.Object)).Returns(true);
+
+            this.mockFileManager.Setup(mfm => mfm.IsFileAutoSyncEnabled()).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.WriteFileToHttpContext(this.fileInfo.Object, It.IsAny<ContentDisposition>())).Verifiable();
+
+            this.mockFileManager.Object.WriteFileToResponse(this.fileInfo.Object, ContentDisposition.Inline);
+
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ExistsFile_Throws_On_Null_Folder()
+        {
+            this.fileManager.FileExists(null, It.IsAny<string>());
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ExistsFile_Throws_On_Null_Or_Empty_FileName(string fileName)
+        {
+            this.fileManager.FileExists(this.folderInfo.Object, fileName);
+        }
+
+        [Test]
+        public void ExistsFile_Calls_FileManager_GetFile()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns<IFileInfo>(null).Verifiable();
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFileManager.Object.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        public void ExistsFile_Calls_FolderProvider_ExistsFile()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this.fileInfo.Object);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true).Verifiable();
+
+            this.mockFileManager.Object.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+
+            this.mockFolder.Verify();
+        }
+
+        [Test]
+        public void ExistsFile_Returns_True_When_File_Exists()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this.fileInfo.Object);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(true);
+
+            var result = this.mockFileManager.Object.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void ExistsFile_Returns_False_When_File_Does_Not_Exist()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this.fileInfo.Object);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Returns(false);
+
+            var result = this.mockFileManager.Object.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FolderProviderException))]
+        public void ExistsFile_Throws_When_FolderProvider_Throws()
+        {
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(this.fileInfo.Object);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName)).Throws<Exception>();
+
+            this.mockFileManager.Object.FileExists(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void GetFile_Throws_On_Null_Or_Empty_FileName(string fileName)
+        {
+            this.fileManager.GetFile(this.folderInfo.Object, fileName);
+        }
+
+        [Test]
+        public void GetFile_Calls_DataProvider_GetFile()
+        {
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
+
+            this.fileManager.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName);
+
+            this.mockData.Verify();
+        }
+
+        [Test]
+        public void GetFile_Handles_Path_In_Portal_Root()
+        {
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderManager.Setup(x => x.GetFolder(Constants.CONTENT_ValidPortalId, string.Empty)).Returns(this.folderInfo.Object).Verifiable();
+            this.mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
+
+            this.fileManager.GetFile(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFileName);
+
+            this.folderManager.Verify();
+            this.mockData.Verify();
+        }
+
+        [Test]
+        public void GetFile_Handles_Path_Beyond_Portal_Root()
+        {
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderManager.Setup(x => x.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this.folderInfo.Object).Verifiable();
+            this.mockData.Setup(md => md.GetFile(Constants.FOLDER_ValidFileName, Constants.FOLDER_ValidFolderId, It.IsAny<bool>())).Returns(It.IsAny<IDataReader>()).Verifiable();
+
+            this.fileManager.GetFile(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath + Constants.FOLDER_ValidFileName);
+
+            this.folderManager.Verify();
+            this.mockData.Verify();
+        }
+
+        [Test]
+        public void GetFileByID_Does_Not_Call_DataCache_GetCache_If_FileId_Is_Not_Valid()
+        {
+            this.mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(this.fileInfo.Object).Verifiable();
+
+            this.fileManager.GetFile(Constants.FOLDER_InvalidFileId);
+
+            this.mockCache.Verify(mc => mc.GetItem(It.IsAny<string>()), Times.Never());
+        }
+
+        [Test]
+        public void GetFileByID_Calls_DataCache_GetCache_First()
+        {
+            this.mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(this.fileInfo.Object).Verifiable();
+
+            this.fileManager.GetFile(Constants.FOLDER_ValidFileId);
+
+            this.mockCache.Verify();
+        }
+
+        [Test]
+        public void GetFileByID_Calls_DataProvider_GetFileById_When_File_Is_Not_In_Cache()
+        {
+            this.mockCache.Setup(mc => mc.GetItem(It.IsAny<string>())).Returns(null);
+
+            this.fileManager.GetFile(Constants.FOLDER_ValidFileId);
+
+            this.mockData.Verify(md => md.GetFileById(Constants.FOLDER_ValidFileId, It.IsAny<bool>()), Times.Once());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void MoveFile_Throws_On_Null_File()
+        {
+            this.fileManager.MoveFile(null, this.folderInfo.Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void MoveFile_Throws_On_Null_DestinationFolder()
+        {
+            this.fileManager.MoveFile(this.fileInfo.Object, null);
+        }
+
+        [Test]
+        public void MoveFile_Calls_FolderProvider_AddFile_And_DeleteFile_And_FileManager_UpdateFile()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            var fileContent = new MemoryStream();
+
+            this.mockFileManager.Setup(mfm => mfm.GetFileContent(this.fileInfo.Object)).Returns(fileContent);
+            string someString;
+            this.mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this.fileInfo.Object, out someString)).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.MoveVersions(this.fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
+
+            this.mockFolder.Setup(mf => mf.AddFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, fileContent)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFile(this.fileInfo.Object)).Verifiable();
+
+            this.mockFileManager.Setup(mfm => mfm.UpdateFile(this.fileInfo.Object)).Verifiable();
+
+            this.mockFileManager.Object.MoveFile(this.fileInfo.Object, this.folderInfo.Object);
+
+            this.mockFolder.Verify();
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        public void MoveFile_Updates_FolderId_And_Folder()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+            this.fileInfo.Setup(fi => fi.Folder).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.fileInfo.SetupSet(fi => fi.FolderId = Constants.FOLDER_OtherValidFolderId).Verifiable();
+            this.fileInfo.SetupSet(fi => fi.Folder = Constants.FOLDER_OtherValidFolderRelativePath).Verifiable();
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            var fileContent = new MemoryStream();
+
+            this.mockFileManager.Setup(mfm => mfm.GetFileContent(this.fileInfo.Object)).Returns(fileContent);
+            string someString;
+            this.mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this.fileInfo.Object, out someString)).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.MoveVersions(this.fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
+            this.mockFileManager.Object.MoveFile(this.fileInfo.Object, this.folderInfo.Object);
+
+            this.fileInfo.Verify();
+        }
+
+        [Test]
+        public void MoveFile_Calls_DeleteFile_When_A_File_With_The_Same_Name_Exists_On_The_Destination_Folder()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_OtherValidFolderId);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            var fileContent = new MemoryStream();
+
+            this.mockFileManager.Setup(mfm => mfm.GetFileContent(this.fileInfo.Object)).Returns(fileContent);
+            string someString;
+            this.mockFileLockingController.Setup(mflc => mflc.IsFileLocked(this.fileInfo.Object, out someString)).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.MoveVersions(this.fileInfo.Object, It.IsAny<IFolderInfo>(), It.IsAny<FolderProvider>(), It.IsAny<FolderProvider>()));
+
+            var existingFile = new FileInfo();
+            this.mockFileManager.Setup(mfm => mfm.GetFile(this.folderInfo.Object, Constants.FOLDER_ValidFileName, It.IsAny<bool>())).Returns(existingFile);
+
+            this.mockFileManager.Setup(mfm => mfm.DeleteFile(existingFile)).Verifiable();
+
+            this.mockFileManager.Object.MoveFile(this.fileInfo.Object, this.folderInfo.Object);
+
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void RenameFile_Throws_On_Null_File()
+        {
+            this.fileManager.RenameFile(null, It.IsAny<string>());
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [ExpectedException(typeof(ArgumentException))]
+        public void RenameFile_Throws_On_Null_Or_Empty_NewFileName(string newFileName)
+        {
+            this.fileManager.RenameFile(this.fileInfo.Object, newFileName);
+        }
+
+        [Test]
+        public void RenameFile_Calls_FolderProvider_RenameFile_When_FileNames_Are_Distinct_And_NewFileName_Does_Not_Exist()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.mockFileManager.Setup(mfm => mfm.FileExists(this.folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.UpdateFile(this.fileInfo.Object));
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
+
+            var folderMapping = new FolderMappingInfo();
+            folderMapping.FolderProviderType = Constants.FOLDER_ValidFolderProviderType;
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFileManager.Object.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherValidFileName);
+
+            this.mockFolder.Verify(mf => mf.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherValidFileName), Times.Once());
+        }
+
+        [Test]
+        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_FileNames_Are_Equal()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+
+            this.fileManager.RenameFile(this.fileInfo.Object, Constants.FOLDER_ValidFileName);
+
+            this.mockFolder.Verify(mf => mf.RenameFile(this.fileInfo.Object, It.IsAny<string>()), Times.Never());
+        }
+
+        [Test]
+        [ExpectedException(typeof(FileAlreadyExistsException))]
+        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_NewFileName_Exists()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.mockFileManager.Setup(mfm => mfm.FileExists(this.folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(true);
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
+
+            this.mockFileManager.Object.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherValidFileName);
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidFileExtensionException))]
+        public void RenameFile_Does_Not_Call_FolderProvider_RenameFile_When_InvalidExtensionType()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+            this.mockFileManager.Setup(fm => fm.IsAllowedExtension(It.IsAny<string>())).Returns(false);
+
+            this.mockFileManager.Object.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherInvalidFileNameExtension);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FolderProviderException))]
+        public void RenameFile_Throws_When_FolderProvider_Throws()
+        {
+            this.fileInfo.Setup(fi => fi.FileName).Returns(Constants.FOLDER_ValidFileName);
+            this.fileInfo.Setup(fi => fi.PortalId).Returns(Constants.CONTENT_ValidPortalId);
+            this.fileInfo.Setup(fi => fi.FolderId).Returns(Constants.FOLDER_ValidFolderId);
+            this.fileInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+
+            this.folderManager.Setup(fm => fm.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(this.folderInfo.Object);
+
+            this.mockFileManager.Setup(mfm => mfm.FileExists(this.folderInfo.Object, Constants.FOLDER_OtherValidFileName, It.IsAny<bool>())).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.UpdateFile(this.fileInfo.Object));
+            this.mockFileManager.Setup(mfm => mfm.IsAllowedExtension(Constants.FOLDER_OtherValidFileName)).Returns(true);
+
+            var folderMapping = new FolderMappingInfo();
+            folderMapping.FolderProviderType = Constants.FOLDER_ValidFolderProviderType;
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.mockFolder.Setup(mf => mf.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherValidFileName)).Throws<Exception>();
+
+            this.mockFileManager.Object.RenameFile(this.fileInfo.Object, Constants.FOLDER_OtherValidFileName);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UnzipFile_Throws_On_Null_File()
+        {
+            this.fileManager.UnzipFile(null, It.IsAny<IFolderInfo>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UnzipFile_Throws_On_Null_DestinationFolder()
+        {
+            this.fileManager.UnzipFile(It.IsAny<IFileInfo>(), null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UnzipFile_Throws_When_File_Extension_Is_Not_Zip()
+        {
+            this.fileInfo.Setup(fi => fi.Extension).Returns("txt");
+
+            this.fileManager.UnzipFile(this.fileInfo.Object, It.IsAny<IFolderInfo>());
+        }
+
+        [Test]
+        public void UnzipFile_Calls_FileManager_ExtractFiles()
+        {
+            this.fileInfo.Setup(fi => fi.Extension).Returns("zip");
+
+            this.mockFileManager.Setup(mfm => mfm.ExtractFiles(this.fileInfo.Object, this.folderInfo.Object, null)).Verifiable();
+
+            this.mockFileManager.Object.UnzipFile(this.fileInfo.Object, this.folderInfo.Object);
+
+            this.mockFileManager.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UpdateFile_Throws_On_Null_File()
+        {
+            this.fileManager.UpdateFile(null);
+        }
+
+        [Test]
+        public void UpdateFile_Calls_DataProvider_UpdateFile()
+        {
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+            this.mockFileManager.Object.UpdateFile(this.fileInfo.Object);
+
+            this.mockData.Verify(
+                md => md.UpdateFile(
+                It.IsAny<int>(),
+                It.IsAny<Guid>(),
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<long>(),
+                It.IsAny<int>(),
+                It.IsAny<int>(),
+                It.IsAny<string>(),
+                It.IsAny<int>(),
+                It.IsAny<int>(),
+                It.IsAny<string>(),
+                It.IsAny<DateTime>(),
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<DateTime>(),
+                It.IsAny<DateTime>(),
+                It.IsAny<bool>(),
+                It.IsAny<int>()),
+                Times.Once());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UpdateFile_Throws_On_Null_File_Overload()
+        {
+            this.fileManager.UpdateFile(null, It.IsAny<Stream>());
+        }
+
+        [Test]
+        public void UpdateFile_Sets_With_And_Height_When_File_Is_Image()
+        {
+            var image = new Bitmap(10, 20);
+
+            this.mockFileManager.Setup(mfm => mfm.IsImageFile(this.fileInfo.Object)).Returns(true);
+            this.mockFileManager.Setup(mfm => mfm.GetImageFromStream(It.IsAny<Stream>())).Returns(image);
+            this.mockFileManager.Setup(mfm => mfm.GetHash(this.fileInfo.Object));
+
+            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+            var stream = new MemoryStream(bytes);
+
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+
+            this.folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
+            this.mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
+
+            this.mockFileManager.Object.UpdateFile(this.fileInfo.Object, stream);
+
+            this.fileInfo.VerifySet(fi => fi.Width = 10);
+            this.fileInfo.VerifySet(fi => fi.Height = 20);
+        }
+
+        [Test]
+        public void UpdateFile_Sets_SHA1Hash()
+        {
+            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+            var stream = new MemoryStream(bytes);
+
+            this.mockFileManager.Setup(mfm => mfm.IsImageFile(this.fileInfo.Object)).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.GetHash(stream)).Returns(Constants.FOLDER_UnmodifiedFileHash);
+
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+
+            this.folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
+            this.mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
+
+            this.mockFileManager.Object.UpdateFile(this.fileInfo.Object, stream);
+
+            this.fileInfo.VerifySet(fi => fi.SHA1Hash = Constants.FOLDER_UnmodifiedFileHash);
+        }
+
+        [Test]
+        public void UpdateFile_Calls_FileManager_UpdateFile_Overload()
+        {
+            var bytes = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+            var stream = new MemoryStream(bytes);
+
+            this.mockFileManager.Setup(mfm => mfm.IsImageFile(this.fileInfo.Object)).Returns(false);
+            this.mockFileManager.Setup(mfm => mfm.GetHash(this.fileInfo.Object)).Returns(Constants.FOLDER_UnmodifiedFileHash);
+
+            this.fileInfo.Setup(fi => fi.StartDate).Returns(DateTime.Parse(Constants.FOLDER_FileStartDate));
+
+            this.folderMappingController.Setup(mp => mp.GetFolderMapping(It.IsAny<int>())).Returns(new FolderMappingInfo() { FolderProviderType = Constants.FOLDER_ValidFolderProviderType });
+            this.mockFolder.Setup(fp => fp.GetHashCode(It.IsAny<IFileInfo>(), It.IsAny<Stream>())).Returns(Constants.FOLDER_UnmodifiedFileHash);
+
+            this.mockFileManager.Object.UpdateFile(this.fileInfo.Object, stream);
+
+            this.mockFileManager.Verify(mfm => mfm.UpdateFile(this.fileInfo.Object), Times.Once());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void GetSeekableStream_Throws_On_Null_Stream()
+        {
+            this.fileManager.GetSeekableStream(null);
+        }
+
+        [Test]
+        public void GetSeekableStream_Returns_The_Same_Stream_If_It_Is_Seekable()
+        {
+            var inputStream = new MemoryStream();
+            var seekableStream = this.fileManager.GetSeekableStream(inputStream);
+
+            Assert.AreEqual(inputStream, seekableStream);
+        }
+
+        [Test]
+        public void GetSeekableStream_Calls_GetHostMapPath_And_Creates_A_Temporary_FileStream_With_Resx_Extension()
+        {
+            var inputStream = new Mock<Stream>();
+            inputStream.Setup(s => s.CanSeek).Returns(false);
+            inputStream.Setup(s => s.Read(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>())).Returns(0);
+
+            this.mockFileManager.Setup(mfm => mfm.GetHostMapPath()).Returns(string.Empty).Verifiable();
+            this.mockFileManager.Setup(mfm => mfm.GetAutoDeleteFileStream(It.Is((string x) => x.EndsWith(".resx")))).Returns(new MemoryStream()).Verifiable();
+
+            this.mockFileManager.Object.GetSeekableStream(inputStream.Object);
+
+            this.mockFileManager.Verify();
+        }
+
+        private void PrepareFileSecurityCheck()
+        {
+            this.mockData.Setup(p => p.GetListEntriesByListName("FileSecurityChecker", string.Empty, Null.NullInteger)).Returns(() =>
+            {
+                var dataTable = new DataTable();
+                dataTable.Columns.Add("EntryID", typeof(int));
+                dataTable.Columns.Add("ListName", typeof(string));
+                dataTable.Columns.Add("Value", typeof(string));
+                dataTable.Columns.Add("Text", typeof(string));
+                dataTable.Columns.Add("Level", typeof(int));
+                dataTable.Columns.Add("SortOrder", typeof(int));
+                dataTable.Columns.Add("DefinitionID", typeof(int));
+                dataTable.Columns.Add("ParentID", typeof(int));
+                dataTable.Columns.Add("Description", typeof(string));
+                dataTable.Columns.Add("PortalID", typeof(int));
+                dataTable.Columns.Add("SystemList", typeof(bool));
+                dataTable.Columns.Add("ParentKey", typeof(string));
+                dataTable.Columns.Add("Parent", typeof(string));
+                dataTable.Columns.Add("ParentList", typeof(string));
+                dataTable.Columns.Add("MaxSortOrder", typeof(int));
+                dataTable.Columns.Add("EntryCount", typeof(int));
+                dataTable.Columns.Add("HasChildren", typeof(int));
+                dataTable.Columns.Add("CreatedByUserID", typeof(int));
+                dataTable.Columns.Add("CreatedOnDate", typeof(DateTime));
+                dataTable.Columns.Add("LastModifiedByUserID", typeof(int));
+                dataTable.Columns.Add("LastModifiedOnDate", typeof(DateTime));
+
+                dataTable.Rows.Add(1, "FileSecurityChecker", "svg",
+                    "DotNetNuke.Services.FileSystem.Internal.SecurityCheckers.SvgFileChecker, DotNetNuke",
+                    0, 0, -1, -0, string.Empty, -1, 1, string.Empty, string.Empty, string.Empty, 0, 1, 0, -1, DateTime.Now, -1, DateTime.Now);
+
+                return dataTable.CreateDataReader();
+            });
+            this.hostController.Setup(c => c.GetString("PerformanceSetting")).Returns("NoCaching");
+            this.globals.Setup(g => g.HostMapPath).Returns(AppDomain.CurrentDomain.BaseDirectory);
+
+            var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
+
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+        }
+
+        private class UnSeekableStream : MemoryStream
+        {
+            public override bool CanSeek
+            {
+                get { return false; }
+            }
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs
index 5056140ebe1..b295473477b 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs	
@@ -2,73 +2,84 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Providers.Folder
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.IO;
-    using System.Linq;
-    using System.Web.Caching;
-
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Data;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.FileSystem;
-    using DotNetNuke.Services.FileSystem.Internal;
-    using DotNetNuke.Services.Log.EventLog;
-    using DotNetNuke.Tests.Core.Providers.Builders;
-    using DotNetNuke.Tests.Utilities;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
-
-    [TestFixture]
-    public class FolderManagerTests
+namespace DotNetNuke.Tests.Core.Providers.Folder
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Data;
+    using DotNetNuke.Services.FileSystem;
+    using DotNetNuke.Services.FileSystem.Internal;
+    using DotNetNuke.Services.Log.EventLog;
+    using DotNetNuke.Tests.Core.Providers.Builders;
+    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
+
+    [TestFixture]
+    public class FolderManagerTests
     {
-        private FolderManager _folderManager;
-        private Mock<FolderProvider> _mockFolder;
-        private Mock<DataProvider> _mockData;
-        private Mock<FolderManager> _mockFolderManager;
-        private Mock<IFolderInfo> _folderInfo;
-        private Mock<IFolderMappingController> _folderMappingController;
-        private Mock<IDirectory> _directory;
-        private Mock<IFile> _file;
-        private Mock<ICBO> _cbo;
-        private Mock<IPathUtils> _pathUtils;
-        private Mock<IUserSecurityController> _mockUserSecurityController;
-        private Mock<IFileDeletionController> _mockFileDeletionController;
+        private FolderManager folderManager;
+        private Mock<FolderProvider> mockFolder;
+        private Mock<DataProvider> mockData;
+        private Mock<FolderManager> mockFolderManager;
+        private Mock<IFolderInfo> folderInfo;
+        private Mock<IFolderMappingController> folderMappingController;
+        private Mock<IDirectory> directory;
+        private Mock<IFile> file;
+        private Mock<ICBO> cbo;
+        private Mock<IPathUtils> pathUtils;
+        private Mock<IUserSecurityController> mockUserSecurityController;
+        private Mock<IFileDeletionController> mockFileDeletionController;
 
         [SetUp]
         public void Setup()
         {
-            this._mockFolder = MockComponentProvider.CreateFolderProvider(Constants.FOLDER_ValidFolderProviderType);
-            this._mockData = MockComponentProvider.CreateDataProvider();
+            this.mockFolder = MockComponentProvider.CreateFolderProvider(Constants.FOLDER_ValidFolderProviderType);
+            this.mockData = MockComponentProvider.CreateDataProvider();
 
-            this._folderMappingController = new Mock<IFolderMappingController>();
-            this._directory = new Mock<IDirectory>();
-            this._file = new Mock<IFile>();
-            this._cbo = new Mock<ICBO>();
-            this._pathUtils = new Mock<IPathUtils>();
-            this._mockUserSecurityController = new Mock<IUserSecurityController>();
-            this._mockFileDeletionController = new Mock<IFileDeletionController>();
+            this.folderMappingController = new Mock<IFolderMappingController>();
+            this.directory = new Mock<IDirectory>();
+            this.file = new Mock<IFile>();
+            this.cbo = new Mock<ICBO>();
+            this.pathUtils = new Mock<IPathUtils>();
+            this.mockUserSecurityController = new Mock<IUserSecurityController>();
+            this.mockFileDeletionController = new Mock<IFileDeletionController>();
 
-            FolderMappingController.RegisterInstance(this._folderMappingController.Object);
-            DirectoryWrapper.RegisterInstance(this._directory.Object);
-            FileWrapper.RegisterInstance(this._file.Object);
-            CBO.SetTestableInstance(this._cbo.Object);
-            PathUtils.RegisterInstance(this._pathUtils.Object);
-            UserSecurityController.SetTestableInstance(this._mockUserSecurityController.Object);
-            FileDeletionController.SetTestableInstance(this._mockFileDeletionController.Object);
+            FolderMappingController.RegisterInstance(this.folderMappingController.Object);
+            DirectoryWrapper.RegisterInstance(this.directory.Object);
+            FileWrapper.RegisterInstance(this.file.Object);
+            CBO.SetTestableInstance(this.cbo.Object);
+            PathUtils.RegisterInstance(this.pathUtils.Object);
+            UserSecurityController.SetTestableInstance(this.mockUserSecurityController.Object);
+            FileDeletionController.SetTestableInstance(this.mockFileDeletionController.Object);
 
-            this._mockFolderManager = new Mock<FolderManager> { CallBase = true };
+            this.mockFolderManager = new Mock<FolderManager> { CallBase = true };
 
-            this._folderManager = new FolderManager();
+            this.folderManager = new FolderManager();
 
-            this._folderInfo = new Mock<IFolderInfo>();
+            this.folderInfo = new Mock<IFolderInfo>();
+
+            var serviceCollection = new ServiceCollection();
+            var mockStatusInfo = new Mock<IApplicationStatusInfo>();
+            mockStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.None);
+
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockStatusInfo.Object);
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
         }
 
         [TearDown]
@@ -80,13 +91,14 @@ public void TearDown()
             CBO.ClearInstance();
             FileDeletionController.ClearInstance();
             MockComponentProvider.ResetContainer();
+            Globals.DependencyProvider = null;
         }
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
         public void AddFolder_Throws_On_Null_FolderPath()
         {
-            this._folderManager.AddFolder(It.IsAny<FolderMappingInfo>(), null);
+            this.folderManager.AddFolder(It.IsAny<FolderMappingInfo>(), null);
         }
 
         // [Test]
@@ -166,9 +178,9 @@ public void AddFolder_Throws_When_Folder_Already_Exists()
                 PortalID = Constants.CONTENT_ValidPortalId,
             };
 
-            this._mockFolderManager.Setup(mfm => mfm.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidSubFolderRelativePath)).Returns(true);
+            this.mockFolderManager.Setup(mfm => mfm.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidSubFolderRelativePath)).Returns(true);
 
-            this._mockFolderManager.Object.AddFolder(folderMapping, Constants.FOLDER_ValidSubFolderRelativePath);
+            this.mockFolderManager.Object.AddFolder(folderMapping, Constants.FOLDER_ValidSubFolderRelativePath);
         }
 
         [Test]
@@ -181,16 +193,16 @@ public void AddFolder_Throws_When_FolderPath_Is_Invalid()
                 PortalID = Constants.CONTENT_ValidPortalId,
             };
 
-            this._mockFolderManager
+            this.mockFolderManager
                 .Setup(mfm => mfm.FolderExists(It.IsAny<int>(), It.IsAny<string>()))
                 .Returns(false);
 
-            this._mockFolderManager
+            this.mockFolderManager
                 .Setup(mfm => mfm.IsValidFolderPath(It.IsAny<string>()))
                 .Returns(false);
 
             // act
-            this._mockFolderManager.Object.AddFolder(folderMapping, Constants.FOLDER_ValidSubFolderRelativePath);
+            this.mockFolderManager.Object.AddFolder(folderMapping, Constants.FOLDER_ValidSubFolderRelativePath);
 
             // assert (implicit)
         }
@@ -201,7 +213,7 @@ public void IsValidFolderPath_Returns_True_When_FolderPath_Is_Valid()
             // arrange (implicit)
 
             // act
-            var result = this._mockFolderManager.Object.IsValidFolderPath(Constants.FOLDER_ValidSubFolderRelativePath);
+            var result = this.mockFolderManager.Object.IsValidFolderPath(Constants.FOLDER_ValidSubFolderRelativePath);
 
             // assert
             Assert.IsTrue(result);
@@ -213,7 +225,7 @@ public void IsValidFolderPath_Returns_False_When_FolderPath_Is_Invalid()
             // arrange (implicit)
 
             // act
-            var result = this._mockFolderManager.Object.IsValidFolderPath(Constants.FOLDER_InvalidSubFolderRelativePath);
+            var result = this.mockFolderManager.Object.IsValidFolderPath(Constants.FOLDER_InvalidSubFolderRelativePath);
 
             // assert
             Assert.IsFalse(result);
@@ -223,7 +235,7 @@ public void IsValidFolderPath_Returns_False_When_FolderPath_Is_Invalid()
         [ExpectedException(typeof(ArgumentNullException))]
         public void DeleteFolder_Throws_On_Null_Folder()
         {
-            this._folderManager.DeleteFolder(null);
+            this.folderManager.DeleteFolder(null);
         }
 
         [Test]
@@ -232,11 +244,11 @@ public void DeleteFolder_Throws_OnNullFolder_WhenRecursive()
         {
             // Arrange
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
             // Act
             var notDeletedSubfolders = new List<IFolderInfo>();
-            this._folderManager.DeleteFolder(null, notDeletedSubfolders);
+            this.folderManager.DeleteFolder(null, notDeletedSubfolders);
         }
 
         [Test]
@@ -248,23 +260,23 @@ public void DeleteFolder_CallsFolderProviderDeleteFolder_WhenRecursive()
                 .Build();
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(folderInfo)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(folderInfo)).Verifiable();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(new List<IFolderInfo>());
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(folderInfo, It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(folderInfo, It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
 
-            this._mockUserSecurityController.Setup(musc => musc.HasFolderPermission(folderInfo, "DELETE")).Returns(true);
+            this.mockUserSecurityController.Setup(musc => musc.HasFolderPermission(folderInfo, "DELETE")).Returns(true);
 
             // Act
             var subfoldersNotDeleted = new List<IFolderInfo>();
-            this._mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
+            this.mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
 
             // Assert
-            this._mockFolder.Verify();
+            this.mockFolder.Verify();
             Assert.AreEqual(0, subfoldersNotDeleted.Count);
         }
 
@@ -292,27 +304,27 @@ public void DeleteFolder_CallsFolderProviderDeleteFolder_WhenRecursive_WhenExist
                 };
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(folderInfo)).Verifiable();
-            this._mockFolder.Setup(mf => mf.DeleteFolder(subfolder1)).Verifiable();
-            this._mockFolder.Setup(mf => mf.DeleteFolder(subfolder2)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(folderInfo)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(subfolder1)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(subfolder2)).Verifiable();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(subfolders);
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsNotIn(folderInfo))).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(subfolders);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsNotIn(folderInfo))).Returns(new List<IFolderInfo>());
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(It.IsAny<IFolderInfo>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(It.IsAny<IFolderInfo>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
 
-            this._mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsAny<IFolderInfo>(), "DELETE")).Returns(true);
+            this.mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsAny<IFolderInfo>(), "DELETE")).Returns(true);
 
             // Act
             var subfoldersNotDeleted = new List<IFolderInfo>();
-            this._mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
+            this.mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
 
             // Assert
-            this._mockFolder.Verify();
+            this.mockFolder.Verify();
             Assert.AreEqual(0, subfoldersNotDeleted.Count);
         }
 
@@ -340,23 +352,23 @@ public void DeleteFolder_SubFoldersCollectionIsNotEmpty_WhenRecursive_WhenUserHa
                 };
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(subfolder1));
+            this.mockFolder.Setup(mf => mf.DeleteFolder(subfolder1));
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(subfolders);
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsNotIn(folderInfo))).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(subfolders);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsNotIn(folderInfo))).Returns(new List<IFolderInfo>());
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(It.IsAny<IFolderInfo>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(It.IsAny<IFolderInfo>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns(new List<IFileInfo>());
 
-            this._mockUserSecurityController.Setup(musc => musc.HasFolderPermission(subfolder2, "DELETE")).Returns(false);
-            this._mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsNotIn(subfolder2), "DELETE")).Returns(true);
+            this.mockUserSecurityController.Setup(musc => musc.HasFolderPermission(subfolder2, "DELETE")).Returns(false);
+            this.mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsNotIn(subfolder2), "DELETE")).Returns(true);
 
             // Act
             var subfoldersNotDeleted = new List<IFolderInfo>();
-            this._mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
+            this.mockFolderManager.Object.DeleteFolder(folderInfo, subfoldersNotDeleted);
 
             // Assert
             Assert.AreEqual(2, subfoldersNotDeleted.Count); // folderInfo and subfolder2 are not deleted
@@ -385,128 +397,128 @@ public void DeleteFolder_Throws_OnFileDeletionControllerThrows_WhenRecursive_Whe
                 };
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
             // _mockFolder.Setup(mf => mf.DeleteFolder(folderInfo));
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(folderInfo)).Returns(new List<IFolderInfo>());
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(folderInfo, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(folderInfo, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
 
-            this._mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsAny<IFolderInfo>(), "DELETE")).Returns(true);
+            this.mockUserSecurityController.Setup(musc => musc.HasFolderPermission(It.IsAny<IFolderInfo>(), "DELETE")).Returns(true);
 
-            this._mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(fileInfo1));
-            this._mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(fileInfo2)).Throws<FileLockedException>();
+            this.mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(fileInfo1));
+            this.mockFileDeletionController.Setup(mfdc => mfdc.DeleteFile(fileInfo2)).Throws<FileLockedException>();
 
             // Act
-            this._mockFolderManager.Object.DeleteFolder(folderInfo, new List<IFolderInfo>());
+            this.mockFolderManager.Object.DeleteFolder(folderInfo, new List<IFolderInfo>());
         }
 
         [Test]
         public void DeleteFolder_Calls_FolderProvider_DeleteFolder()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
 
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(this._folderInfo.Object)).Verifiable();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(this.folderInfo.Object)).Verifiable();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
 
-            this._mockFolderManager.Object.DeleteFolder(this._folderInfo.Object);
+            this.mockFolderManager.Object.DeleteFolder(this.folderInfo.Object);
 
-            this._mockFolder.Verify();
+            this.mockFolder.Verify();
         }
 
         [Test]
         [ExpectedException(typeof(FolderProviderException))]
         public void DeleteFolder_Throws_When_FolderProvider_Throws()
         {
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
 
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(this._folderInfo.Object)).Throws<Exception>();
+            this.mockFolder.Setup(mf => mf.DeleteFolder(this.folderInfo.Object)).Throws<Exception>();
 
-            this._mockFolderManager.Object.DeleteFolder(this._folderInfo.Object);
+            this.mockFolderManager.Object.DeleteFolder(this.folderInfo.Object);
         }
 
         [Test]
         public void DeleteFolder_Calls_Directory_Delete_When_Directory_Exists()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
 
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(this._folderInfo.Object));
+            this.mockFolder.Setup(mf => mf.DeleteFolder(this.folderInfo.Object));
 
-            this._directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
-            this._directory.Setup(d => d.Delete(Constants.FOLDER_ValidFolderPath, true)).Verifiable();
+            this.directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
+            this.directory.Setup(d => d.Delete(Constants.FOLDER_ValidFolderPath, true)).Verifiable();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
 
-            this._mockFolderManager.Object.DeleteFolder(this._folderInfo.Object);
+            this.mockFolderManager.Object.DeleteFolder(this.folderInfo.Object);
 
-            this._directory.Verify();
+            this.directory.Verify();
         }
 
         [Test]
         public void DeleteFolder_Calls_FolderManager_DeleteFolder_Overload()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.PhysicalPath).Returns(Constants.FOLDER_ValidFolderPath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var folderMapping = new FolderMappingInfo { FolderProviderType = Constants.FOLDER_ValidFolderProviderType };
 
-            this._folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.folderMappingController.Setup(fmc => fmc.GetFolderMapping(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
 
-            this._mockFolder.Setup(mf => mf.DeleteFolder(this._folderInfo.Object));
+            this.mockFolder.Setup(mf => mf.DeleteFolder(this.folderInfo.Object));
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Verifiable();
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Verifiable();
 
-            this._mockFolderManager.Object.DeleteFolder(this._folderInfo.Object);
+            this.mockFolderManager.Object.DeleteFolder(this.folderInfo.Object);
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
         public void ExistsFolder_Throws_On_Null_FolderPath()
         {
-            this._folderManager.FolderExists(Constants.CONTENT_ValidPortalId, null);
+            this.folderManager.FolderExists(Constants.CONTENT_ValidPortalId, null);
         }
 
         [Test]
         public void ExistsFolder_Calls_FolderManager_GetFolder()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this._folderInfo.Object).Verifiable();
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this.folderInfo.Object).Verifiable();
 
-            this._mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            this.mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
         public void ExistsFolder_Returns_True_When_Folder_Exists()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this._folderInfo.Object);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this.folderInfo.Object);
 
-            var result = this._mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            var result = this.mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
             Assert.IsTrue(result);
         }
@@ -514,9 +526,9 @@ public void ExistsFolder_Returns_True_When_Folder_Exists()
         [Test]
         public void ExistsFolder_Returns_False_When_Folder_Does_Not_Exist()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns<IFolderInfo>(null);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns<IFolderInfo>(null);
 
-            var result = this._mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            var result = this.mockFolderManager.Object.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
             Assert.IsFalse(result);
         }
@@ -525,36 +537,36 @@ public void ExistsFolder_Returns_False_When_Folder_Does_Not_Exist()
         [ExpectedException(typeof(ArgumentNullException))]
         public void GetFilesByFolder_Throws_On_Null_Folder()
         {
-            this._folderManager.GetFiles(null);
+            this.folderManager.GetFiles(null);
         }
 
         [Test]
         public void GetFilesByFolder_Calls_DataProvider_GetFiles()
         {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
 
             var files = new DataTable();
             files.Columns.Add("FolderName");
 
             var dr = files.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr).Verifiable();
+            this.mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr).Verifiable();
 
             var filesList = new List<FileInfo> { new FileInfo() { FileName = Constants.FOLDER_ValidFileName } };
 
-            this._cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
+            this.cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
 
-            this._folderManager.GetFiles(this._folderInfo.Object);
+            this.folderManager.GetFiles(this.folderInfo.Object);
 
-            this._mockData.Verify();
+            this.mockData.Verify();
         }
 
         [Test]
         public void GetFilesByFolder_Count_Equals_DataProvider_GetFiles_Count()
         {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
 
             var files = new DataTable();
             files.Columns.Add("FileName");
@@ -562,13 +574,13 @@ public void GetFilesByFolder_Count_Equals_DataProvider_GetFiles_Count()
 
             var dr = files.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr);
+            this.mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr);
 
             var filesList = new List<FileInfo> { new FileInfo { FileName = Constants.FOLDER_ValidFileName } };
 
-            this._cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
+            this.cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
 
-            var result = this._folderManager.GetFiles(this._folderInfo.Object).ToList();
+            var result = this.folderManager.GetFiles(this.folderInfo.Object).ToList();
 
             Assert.AreEqual(1, result.Count);
         }
@@ -576,8 +588,8 @@ public void GetFilesByFolder_Count_Equals_DataProvider_GetFiles_Count()
         [Test]
         public void GetFilesByFolder_Returns_Valid_FileNames_When_Folder_Contains_Files()
         {
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
 
             var files = new DataTable();
             files.Columns.Add("FileName");
@@ -586,7 +598,7 @@ public void GetFilesByFolder_Returns_Valid_FileNames_When_Folder_Contains_Files(
 
             var dr = files.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr);
+            this.mockData.Setup(md => md.GetFiles(Constants.FOLDER_ValidFolderId, It.IsAny<bool>(), It.IsAny<bool>())).Returns(dr);
 
             var filesList = new List<FileInfo>
                                 {
@@ -594,9 +606,9 @@ public void GetFilesByFolder_Returns_Valid_FileNames_When_Folder_Contains_Files(
                                     new FileInfo { FileName = Constants.FOLDER_OtherValidFileName },
                                 };
 
-            this._cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
+            this.cbo.Setup(cbo => cbo.FillCollection<FileInfo>(dr)).Returns(filesList);
 
-            var result = this._folderManager.GetFiles(this._folderInfo.Object).Cast<FileInfo>();
+            var result = this.folderManager.GetFiles(this.folderInfo.Object).Cast<FileInfo>();
 
             CollectionAssert.AreEqual(filesList, result);
         }
@@ -607,11 +619,11 @@ public void GetFolder_Calls_DataProvider_GetFolder()
             var folderDataTable = new DataTable();
             folderDataTable.Columns.Add("FolderName");
 
-            this._mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(folderDataTable.CreateDataReader()).Verifiable();
+            this.mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(folderDataTable.CreateDataReader()).Verifiable();
 
-            this._folderManager.GetFolder(Constants.FOLDER_ValidFolderId);
+            this.folderManager.GetFolder(Constants.FOLDER_ValidFolderId);
 
-            this._mockData.Verify();
+            this.mockData.Verify();
         }
 
         [Test]
@@ -622,10 +634,10 @@ public void GetFolder_Returns_Null_When_Folder_Does_Not_Exist()
 
             var dr = folderDataTable.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(dr);
-            this._cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns<FolderInfo>(null);
+            this.mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(dr);
+            this.cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns<FolderInfo>(null);
 
-            var result = this._folderManager.GetFolder(Constants.FOLDER_ValidFolderId);
+            var result = this.folderManager.GetFolder(Constants.FOLDER_ValidFolderId);
 
             Assert.IsNull(result);
         }
@@ -633,9 +645,9 @@ public void GetFolder_Returns_Null_When_Folder_Does_Not_Exist()
         [Test]
         public void GetFolder_Returns_Valid_Folder_When_Folder_Exists()
         {
-            this._folderInfo.Setup(fi => fi.FolderName).Returns(Constants.FOLDER_ValidFolderName);
+            this.folderInfo.Setup(fi => fi.FolderName).Returns(Constants.FOLDER_ValidFolderName);
 
-            this._pathUtils.Setup(pu => pu.RemoveTrailingSlash(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderName);
+            this.pathUtils.Setup(pu => pu.RemoveTrailingSlash(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderName);
 
             var folderDataTable = new DataTable();
             folderDataTable.Columns.Add("FolderName");
@@ -643,13 +655,13 @@ public void GetFolder_Returns_Valid_Folder_When_Folder_Exists()
 
             var dr = folderDataTable.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(dr);
+            this.mockData.Setup(md => md.GetFolder(Constants.FOLDER_ValidFolderId)).Returns(dr);
 
             var folderInfo = new FolderInfo { FolderPath = Constants.FOLDER_ValidFolderRelativePath };
 
-            this._cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns(folderInfo);
+            this.cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns(folderInfo);
 
-            var result = this._mockFolderManager.Object.GetFolder(Constants.FOLDER_ValidFolderId);
+            var result = this.mockFolderManager.Object.GetFolder(Constants.FOLDER_ValidFolderId);
 
             Assert.AreEqual(Constants.FOLDER_ValidFolderName, result.FolderName);
         }
@@ -658,7 +670,7 @@ public void GetFolder_Returns_Valid_Folder_When_Folder_Exists()
         [ExpectedException(typeof(ArgumentNullException))]
         public void GetFolder_Throws_On_Null_FolderPath()
         {
-            this._folderManager.GetFolder(It.IsAny<int>(), null);
+            this.folderManager.GetFolder(It.IsAny<int>(), null);
         }
 
         [Test]
@@ -666,25 +678,25 @@ public void GetFolder_Calls_GetFolders()
         {
             var foldersSorted = new List<IFolderInfo>();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted).Verifiable();
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted).Verifiable();
 
-            this._mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            this.mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
         public void GetFolder_Calls_DataProvider_GetFolder_When_Folder_Is_Not_In_Cache()
         {
-            this._pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
 
             var foldersSorted = new List<IFolderInfo>();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted);
 
-            this._mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            this.mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
-            this._mockData.Verify(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath), Times.Once());
+            this.mockData.Verify(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath), Times.Once());
         }
 
         [Test]
@@ -695,13 +707,13 @@ public void GetFolder_Returns_Null_When_Folder_Does_Not_Exist_Overload()
 
             var dr = folderDataTable.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(dr);
+            this.mockData.Setup(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(dr);
 
-            this._cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns<FolderInfo>(null);
+            this.cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns<FolderInfo>(null);
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
 
-            var result = this._mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            var result = this.mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
             Assert.IsNull(result);
         }
@@ -709,8 +721,8 @@ public void GetFolder_Returns_Null_When_Folder_Does_Not_Exist_Overload()
         [Test]
         public void GetFolder_Returns_Valid_Folder_When_Folder_Exists_Overload()
         {
-            this._pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._pathUtils.Setup(pu => pu.RemoveTrailingSlash(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderName);
+            this.pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.RemoveTrailingSlash(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderName);
 
             var folderDataTable = new DataTable();
             folderDataTable.Columns.Add("FolderName");
@@ -718,15 +730,15 @@ public void GetFolder_Returns_Valid_Folder_When_Folder_Exists_Overload()
 
             var dr = folderDataTable.CreateDataReader();
 
-            this._mockData.Setup(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(dr);
+            this.mockData.Setup(md => md.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(dr);
 
             var folderInfo = new FolderInfo { FolderPath = Constants.FOLDER_ValidFolderRelativePath };
 
-            this._cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns(folderInfo);
+            this.cbo.Setup(cbo => cbo.FillObject<FolderInfo>(dr)).Returns(folderInfo);
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
 
-            var result = this._mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
+            var result = this.mockFolderManager.Object.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath);
 
             Assert.AreEqual(Constants.FOLDER_ValidFolderName, result.FolderName);
         }
@@ -735,17 +747,17 @@ public void GetFolder_Returns_Valid_Folder_When_Folder_Exists_Overload()
         [ExpectedException(typeof(ArgumentNullException))]
         public void GetFoldersByParentFolder_Throws_On_Null_ParentFolder()
         {
-            this._folderManager.GetFolders((IFolderInfo)null);
+            this.folderManager.GetFolders((IFolderInfo)null);
         }
 
         [Test]
         public void GetFoldersByParentFolder_Returns_Empty_List_When_ParentFolder_Contains_No_Subfolders()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(new List<IFolderInfo>());
 
-            var result = this._mockFolderManager.Object.GetFolders(this._folderInfo.Object).ToList();
+            var result = this.mockFolderManager.Object.GetFolders(this.folderInfo.Object).ToList();
 
             Assert.AreEqual(0, result.Count);
         }
@@ -753,8 +765,8 @@ public void GetFoldersByParentFolder_Returns_Empty_List_When_ParentFolder_Contai
         [Test]
         public void GetFoldersByParentFolder_Returns_Valid_Subfolders()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderID).Returns(Constants.FOLDER_ValidFolderId);
 
             var foldersSorted = new List<IFolderInfo>
                                     {
@@ -762,9 +774,9 @@ public void GetFoldersByParentFolder_Returns_Valid_Subfolders()
                                         new FolderInfo { FolderID = Constants.FOLDER_OtherValidFolderId, ParentID = Constants.FOLDER_ValidFolderId },
                                     };
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(Constants.CONTENT_ValidPortalId)).Returns(foldersSorted);
 
-            var result = this._mockFolderManager.Object.GetFolders(this._folderInfo.Object).ToList();
+            var result = this.mockFolderManager.Object.GetFolders(this.folderInfo.Object).ToList();
 
             Assert.AreEqual(1, result.Count);
             Assert.AreEqual(Constants.FOLDER_OtherValidFolderId, result[0].FolderID);
@@ -775,18 +787,18 @@ public void GetFolders_Calls_CBO_GetCachedObject()
         {
             var folders = new List<FolderInfo>();
 
-            this._cbo.Setup(cbo => cbo.GetCachedObject<List<FolderInfo>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), false)).Returns(folders).Verifiable();
+            this.cbo.Setup(cbo => cbo.GetCachedObject<List<FolderInfo>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), false)).Returns(folders).Verifiable();
 
-            this._mockFolderManager.Object.GetFolders(Constants.CONTENT_ValidPortalId);
+            this.mockFolderManager.Object.GetFolders(Constants.CONTENT_ValidPortalId);
 
-            this._cbo.Verify();
+            this.cbo.Verify();
         }
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
         public void RenameFolder_Throws_On_Null_Folder()
         {
-            this._folderManager.RenameFolder(null, It.IsAny<string>());
+            this.folderManager.RenameFolder(null, It.IsAny<string>());
         }
 
         [Test]
@@ -795,41 +807,41 @@ public void RenameFolder_Throws_On_Null_Folder()
         [ExpectedException(typeof(ArgumentException))]
         public void RenameFolder_Throws_On_Null_Or_Empty_NewFolderName(string newFolderName)
         {
-            this._folderManager.RenameFolder(this._folderInfo.Object, newFolderName);
+            this.folderManager.RenameFolder(this.folderInfo.Object, newFolderName);
         }
 
         [Test]
         [ExpectedException(typeof(FolderAlreadyExistsException))]
         public void RenameFolder_Throws_When_DestinationFolder_Exists()
         {
-            this._pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_OtherValidFolderName)).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_OtherValidFolderName)).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
 
-            this._folderInfo.Setup(fi => fi.FolderName).Returns(Constants.FOLDER_ValidFolderName);
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderName).Returns(Constants.FOLDER_ValidFolderName);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
 
-            this._mockFolderManager.Setup(mfm => mfm.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_OtherValidFolderRelativePath)).Returns(true);
+            this.mockFolderManager.Setup(mfm => mfm.FolderExists(Constants.CONTENT_ValidPortalId, Constants.FOLDER_OtherValidFolderRelativePath)).Returns(true);
 
-            this._mockFolderManager.Object.RenameFolder(this._folderInfo.Object, Constants.FOLDER_OtherValidFolderName);
+            this.mockFolderManager.Object.RenameFolder(this.folderInfo.Object, Constants.FOLDER_OtherValidFolderName);
         }
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
         public void UpdateFolder_Throws_On_Null_Folder()
         {
-            this._folderManager.UpdateFolder(null);
+            this.folderManager.UpdateFolder(null);
         }
 
         [Test]
         public void UpdateFolder_Calls_DataProvider_UpdateFolder()
         {
-            this._mockFolderManager.Setup(mfm => mfm.AddLogEntry(this._folderInfo.Object, It.IsAny<EventLogController.EventLogType>()));
-            this._mockFolderManager.Setup(mfm => mfm.SaveFolderPermissions(this._folderInfo.Object));
-            this._mockFolderManager.Setup(mfm => mfm.ClearFolderCache(It.IsAny<int>()));
+            this.mockFolderManager.Setup(mfm => mfm.AddLogEntry(this.folderInfo.Object, It.IsAny<EventLogController.EventLogType>()));
+            this.mockFolderManager.Setup(mfm => mfm.SaveFolderPermissions(this.folderInfo.Object));
+            this.mockFolderManager.Setup(mfm => mfm.ClearFolderCache(It.IsAny<int>()));
 
-            this._mockFolderManager.Object.UpdateFolder(this._folderInfo.Object);
+            this.mockFolderManager.Object.UpdateFolder(this.folderInfo.Object);
 
-            this._mockData.Verify(
+            this.mockData.Verify(
                 md => md.UpdateFolder(
                 It.IsAny<int>(),
                 It.IsAny<Guid>(),
@@ -851,27 +863,27 @@ public void UpdateFolder_Calls_DataProvider_UpdateFolder()
         [ExpectedException(typeof(ArgumentNullException))]
         public void SynchronizeFolder_Throws_On_Null_RelativePath()
         {
-            this._folderManager.Synchronize(It.IsAny<int>(), null, It.IsAny<bool>(), It.IsAny<bool>());
+            this.folderManager.Synchronize(It.IsAny<int>(), null, It.IsAny<bool>(), It.IsAny<bool>());
         }
 
         [Test]
         [ExpectedException(typeof(NoNetworkAvailableException))]
         public void SynchronizeFolder_Throws_When_Some_Folder_Mapping_Requires_Network_Connectivity_But_There_Is_No_Network_Available()
         {
-            this._mockFolderManager.Setup(mfm => mfm.AreThereFolderMappingsRequiringNetworkConnectivity(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false)).Returns(true);
-            this._mockFolderManager.Setup(mfm => mfm.IsNetworkAvailable()).Returns(false);
+            this.mockFolderManager.Setup(mfm => mfm.AreThereFolderMappingsRequiringNetworkConnectivity(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false)).Returns(true);
+            this.mockFolderManager.Setup(mfm => mfm.IsNetworkAvailable()).Returns(false);
 
-            this._mockFolderManager.Object.Synchronize(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false, false);
+            this.mockFolderManager.Object.Synchronize(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false, false);
         }
 
         [Test]
         public void GetFileSystemFolders_Returns_Empty_List_When_Folder_Does_Not_Exist()
         {
-            this._pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderPath);
+            this.pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderPath);
 
-            this._directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(false);
+            this.directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(false);
 
-            var result = this._mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
+            var result = this.mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
 
             Assert.IsEmpty(result);
         }
@@ -879,11 +891,11 @@ public void GetFileSystemFolders_Returns_Empty_List_When_Folder_Does_Not_Exist()
         [Test]
         public void GetFileSystemFolders_Returns_One_Item_When_Folder_Exists_And_Is_Not_Recursive()
         {
-            this._pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderPath);
+            this.pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderPath);
 
-            this._directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
+            this.directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
 
-            var result = this._mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
+            var result = this.mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
 
             Assert.AreEqual(1, result.Count);
             Assert.IsTrue(result.Values[0].ExistsInFileSystem);
@@ -892,28 +904,28 @@ public void GetFileSystemFolders_Returns_One_Item_When_Folder_Exists_And_Is_Not_
         [Test]
         public void GetFileSystemFolders_Calls_FolderManager_GetFileSystemFoldersRecursive_When_Folder_Exists_And_Is_Recursive()
         {
-            this._pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath))
+            this.pathUtils.Setup(pu => pu.GetPhysicalPath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath))
                 .Returns(Constants.FOLDER_ValidFolderPath);
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath))
+            this.mockFolderManager.Setup(mfm => mfm.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath))
                 .Returns(It.IsAny<SortedList<string, FolderManager.MergedTreeItem>>())
                 .Verifiable();
 
-            this._directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
+            this.directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
 
-            this._mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, true);
+            this.mockFolderManager.Object.GetFileSystemFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, true);
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
         public void GetFileSystemFoldersRecursive_Returns_One_Item_When_Folder_Does_Not_Have_SubFolders()
         {
-            this._pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
 
-            this._directory.Setup(d => d.GetDirectories(Constants.FOLDER_ValidFolderPath)).Returns(new string[0]);
+            this.directory.Setup(d => d.GetDirectories(Constants.FOLDER_ValidFolderPath)).Returns(new string[0]);
 
-            var result = this._mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath);
+            var result = this.mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderPath);
 
             Assert.AreEqual(1, result.Count);
         }
@@ -930,15 +942,15 @@ public void GetFileSystemFoldersRecursive_Returns_All_The_Folders_In_Folder_Tree
                                         { @"C:\folder\subfolder2\subsubfolder2", "folder/subfolder2/subsubfolder2/" },
                                     };
 
-            this._pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, It.IsAny<string>()))
+            this.pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, It.IsAny<string>()))
                 .Returns<int, string>((portalID, physicalPath) => relativePaths[physicalPath]);
 
             var directories = new List<string> { @"C:\folder\subfolder", @"C:\folder\subfolder2", @"C:\folder\subfolder2\subsubfolder", @"C:\folder\subfolder2\subsubfolder2" };
 
-            this._directory.Setup(d => d.GetDirectories(It.IsAny<string>()))
+            this.directory.Setup(d => d.GetDirectories(It.IsAny<string>()))
                 .Returns<string>(path => directories.FindAll(sub => sub.StartsWith(path + "\\") && sub.LastIndexOf("\\") == path.Length).ToArray());
 
-            var result = this._mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, @"C:\folder");
+            var result = this.mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, @"C:\folder");
 
             Assert.AreEqual(5, result.Count);
         }
@@ -955,15 +967,15 @@ public void GetFileSystemFoldersRecursive_Sets_ExistsInFileSystem_For_All_Items(
                                         { @"C:\folder\subfolder2\subsubfolder2", "folder/subfolder2/subsubfolder2/" },
                                     };
 
-            this._pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, It.IsAny<string>()))
+            this.pathUtils.Setup(pu => pu.GetRelativePath(Constants.CONTENT_ValidPortalId, It.IsAny<string>()))
                 .Returns<int, string>((portalID, physicalPath) => relativePaths[physicalPath]);
 
             var directories = new List<string> { @"C:\folder", @"C:\folder\subfolder", @"C:\folder\subfolder2", @"C:\folder\subfolder2\subsubfolder", @"C:\folder\subfolder2\subsubfolder2" };
 
-            this._directory.Setup(d => d.GetDirectories(It.IsAny<string>()))
+            this.directory.Setup(d => d.GetDirectories(It.IsAny<string>()))
                 .Returns<string>(path => directories.FindAll(sub => sub.StartsWith(path + "\\") && sub.LastIndexOf("\\") == path.Length).ToArray());
 
-            var result = this._mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, @"C:\folder");
+            var result = this.mockFolderManager.Object.GetFileSystemFoldersRecursive(Constants.CONTENT_ValidPortalId, @"C:\folder");
 
             foreach (var mergedTreeItem in result.Values)
             {
@@ -974,9 +986,9 @@ public void GetFileSystemFoldersRecursive_Sets_ExistsInFileSystem_For_All_Items(
         [Test]
         public void GetDatabaseFolders_Returns_Empty_List_When_Folder_Does_Not_Exist()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns<IFolderInfo>(null);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns<IFolderInfo>(null);
 
-            var result = this._mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
+            var result = this.mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
 
             Assert.IsEmpty(result);
         }
@@ -984,9 +996,9 @@ public void GetDatabaseFolders_Returns_Empty_List_When_Folder_Does_Not_Exist()
         [Test]
         public void GetDatabaseFolders_Returns_One_Item_When_Folder_Exists_And_Is_Not_Recursive()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this._folderInfo.Object);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Returns(this.folderInfo.Object);
 
-            var result = this._mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
+            var result = this.mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, false);
 
             Assert.AreEqual(1, result.Count);
             Assert.IsTrue(result.Values[0].ExistsInDatabase);
@@ -995,29 +1007,29 @@ public void GetDatabaseFolders_Returns_One_Item_When_Folder_Exists_And_Is_Not_Re
         [Test]
         public void GetDatabaseFolders_Calls_FolderManager_GetDatabaseFoldersRecursive_When_Folder_Exists_And_Is_Recursive()
         {
-            this._mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath))
-                .Returns(this._folderInfo.Object);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath))
+                .Returns(this.folderInfo.Object);
 
-            this._mockFolderManager.Setup(mfm => mfm.GetDatabaseFoldersRecursive(this._folderInfo.Object))
+            this.mockFolderManager.Setup(mfm => mfm.GetDatabaseFoldersRecursive(this.folderInfo.Object))
                 .Returns(It.IsAny<SortedList<string, FolderManager.MergedTreeItem>>())
                 .Verifiable();
 
-            this._mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, true);
+            this.mockFolderManager.Object.GetDatabaseFolders(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath, true);
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
         public void GetDatabaseFoldersRecursive_Returns_One_Item_When_Folder_Does_Not_Have_SubFolders()
         {
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var subfolders = new List<IFolderInfo>();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(this._folderInfo.Object)).Returns(subfolders);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(this.folderInfo.Object)).Returns(subfolders);
 
-            var result = this._mockFolderManager.Object.GetDatabaseFoldersRecursive(this._folderInfo.Object);
+            var result = this.mockFolderManager.Object.GetDatabaseFoldersRecursive(this.folderInfo.Object);
 
             Assert.AreEqual(1, result.Count);
         }
@@ -1025,8 +1037,8 @@ public void GetDatabaseFoldersRecursive_Returns_One_Item_When_Folder_Does_Not_Ha
         [Test]
         public void GetDatabaseFoldersRecursive_Returns_All_The_Folders_In_Folder_Tree()
         {
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns("folder/");
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns("folder/");
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var subfolders = new List<IFolderInfo>
                                  {
@@ -1036,13 +1048,13 @@ public void GetDatabaseFoldersRecursive_Returns_All_The_Folders_In_Folder_Tree()
                                      new FolderInfo { FolderPath = "folder/subfolder2/subsubfolder2/", FolderMappingID = Constants.FOLDER_ValidFolderMappingID },
                                  };
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsAny<IFolderInfo>()))
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsAny<IFolderInfo>()))
                 .Returns<IFolderInfo>(parent => subfolders.FindAll(sub =>
                     sub.FolderPath.StartsWith(parent.FolderPath) &&
                     sub.FolderPath.Length > parent.FolderPath.Length &&
                     sub.FolderPath.Substring(parent.FolderPath.Length).IndexOf("/") == sub.FolderPath.Substring(parent.FolderPath.Length).LastIndexOf("/")));
 
-            var result = this._mockFolderManager.Object.GetDatabaseFoldersRecursive(this._folderInfo.Object);
+            var result = this.mockFolderManager.Object.GetDatabaseFoldersRecursive(this.folderInfo.Object);
 
             Assert.AreEqual(5, result.Count);
         }
@@ -1050,8 +1062,8 @@ public void GetDatabaseFoldersRecursive_Returns_All_The_Folders_In_Folder_Tree()
         [Test]
         public void GetDatabaseFoldersRecursive_Sets_ExistsInDatabase_For_All_Items()
         {
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns("folder/");
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns("folder/");
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var subfolders = new List<IFolderInfo>
                                  {
@@ -1061,13 +1073,13 @@ public void GetDatabaseFoldersRecursive_Sets_ExistsInDatabase_For_All_Items()
                                      new FolderInfo() { FolderPath = "folder/subfolder2/subsubfolder2/", FolderMappingID = Constants.FOLDER_ValidFolderMappingID },
                                  };
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsAny<IFolderInfo>()))
+            this.mockFolderManager.Setup(mfm => mfm.GetFolders(It.IsAny<IFolderInfo>()))
                 .Returns<IFolderInfo>(parent => subfolders.FindAll(sub =>
                     sub.FolderPath.StartsWith(parent.FolderPath) &&
                     sub.FolderPath.Length > parent.FolderPath.Length &&
                     sub.FolderPath.Substring(parent.FolderPath.Length).IndexOf("/") == sub.FolderPath.Substring(parent.FolderPath.Length).LastIndexOf("/")));
 
-            var result = this._mockFolderManager.Object.GetDatabaseFoldersRecursive(this._folderInfo.Object);
+            var result = this.mockFolderManager.Object.GetDatabaseFoldersRecursive(this.folderInfo.Object);
 
             foreach (var mergedTreeItem in result.Values)
             {
@@ -1150,7 +1162,7 @@ public void MergeFolderLists_Returns_Empty_List_When_Both_Lists_Are_Empty()
             var list1 = new SortedList<string, FolderManager.MergedTreeItem>();
             var list2 = new SortedList<string, FolderManager.MergedTreeItem>();
 
-            var result = this._folderManager.MergeFolderLists(list1, list2);
+            var result = this.folderManager.MergeFolderLists(list1, list2);
 
             Assert.IsEmpty(result);
         }
@@ -1170,7 +1182,7 @@ public void MergeFolderLists_Count_Equals_The_Intersection_Count_Between_Both_Li
                                 { "folder3", new FolderManager.MergedTreeItem { FolderPath = "folder3" } },
                             };
 
-            var result = this._folderManager.MergeFolderLists(list1, list2);
+            var result = this.folderManager.MergeFolderLists(list1, list2);
 
             Assert.AreEqual(3, result.Count);
         }
@@ -2081,7 +2093,7 @@ public void MergeFolderLists_Count_Equals_The_Intersection_Count_Between_Both_Li
         [ExpectedException(typeof(ArgumentNullException))]
         public void MoveFolder_Throws_On_Null_Folder()
         {
-            this._folderManager.MoveFolder(null, It.IsAny<string>());
+            this.folderManager.MoveFolder(null, It.IsAny<string>());
         }
 
         [Test]
@@ -2090,42 +2102,42 @@ public void MoveFolder_Throws_On_Null_Folder()
         [ExpectedException(typeof(ArgumentException))]
         public void MoveFolder_Throws_On_Null_Or_Emtpy_NewFolderPath(string newFolderPath)
         {
-            this._folderManager.MoveFolder(this._folderInfo.Object, newFolderPath);
+            this.folderManager.MoveFolder(this.folderInfo.Object, newFolderPath);
         }
 
         [Test]
         public void MoveFolder_Returns_The_Same_Folder_If_The_Paths_Are_The_Same()
         {
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
 
             IFolderInfo destinationFolder = new FolderInfo();
             destinationFolder.FolderPath = Constants.FOLDER_ValidFolderRelativePath;
 
-            this._pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_ValidFolderRelativePath)).Returns(Constants.FOLDER_ValidFolderRelativePath);
 
-            var movedFolder = this._folderManager.MoveFolder(this._folderInfo.Object, destinationFolder);
+            var movedFolder = this.folderManager.MoveFolder(this.folderInfo.Object, destinationFolder);
 
-            Assert.AreEqual(this._folderInfo.Object, movedFolder);
+            Assert.AreEqual(this.folderInfo.Object, movedFolder);
         }
 
         [Test]
         [ExpectedException(typeof(InvalidOperationException))]
         public void MoveFolder_Throws_When_Move_Operation_Is_Not_Valid()
         {
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             IFolderInfo destinationFolder = new FolderInfo();
             destinationFolder.FolderPath = Constants.FOLDER_OtherValidFolderRelativePath;
             destinationFolder.FolderMappingID = Constants.FOLDER_ValidFolderMappingID;
 
-            this._pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_OtherValidFolderRelativePath)).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
+            this.pathUtils.Setup(pu => pu.FormatFolderPath(Constants.FOLDER_OtherValidFolderRelativePath)).Returns(Constants.FOLDER_OtherValidFolderRelativePath);
 
-            this._mockFolderManager.Setup(mfm => mfm.FolderExists(It.IsAny<int>(), It.IsAny<string>())).Returns(false);
-            this._mockFolderManager.Setup(mfm => mfm.CanMoveBetweenFolderMappings(It.IsAny<FolderMappingInfo>(), It.IsAny<FolderMappingInfo>())).Returns(true);
-            this._mockFolderManager.Setup(mfm => mfm.IsMoveOperationValid(this._folderInfo.Object, destinationFolder, It.IsAny<string>())).Returns(false);
+            this.mockFolderManager.Setup(mfm => mfm.FolderExists(It.IsAny<int>(), It.IsAny<string>())).Returns(false);
+            this.mockFolderManager.Setup(mfm => mfm.CanMoveBetweenFolderMappings(It.IsAny<FolderMappingInfo>(), It.IsAny<FolderMappingInfo>())).Returns(true);
+            this.mockFolderManager.Setup(mfm => mfm.IsMoveOperationValid(this.folderInfo.Object, destinationFolder, It.IsAny<string>())).Returns(false);
 
-            this._mockFolderManager.Object.MoveFolder(this._folderInfo.Object, destinationFolder);
+            this.mockFolderManager.Object.MoveFolder(this.folderInfo.Object, destinationFolder);
         }
 
         // [Test]
@@ -2184,9 +2196,9 @@ public void MoveFolder_Throws_When_Move_Operation_Is_Not_Valid()
         [Test]
         public void OverwriteFolder_Calls_MoveFile_For_Each_File_In_Source_Folder()
         {
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var destinationFolder = new FolderInfo();
 
@@ -2195,21 +2207,21 @@ public void OverwriteFolder_Calls_MoveFile_For_Each_File_In_Source_Folder()
             var file3 = new FileInfo();
 
             var files = new List<IFileInfo> { file1, file2, file3 };
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(this._folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(this.folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
 
             var fileManager = new Mock<IFileManager>();
             FileManager.RegisterInstance(fileManager.Object);
 
             fileManager.Setup(fm => fm.MoveFile(It.IsAny<IFileInfo>(), destinationFolder));
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
 
             var folderMapping = new FolderMappingInfo();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(false);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(false);
 
-            this._mockFolderManager.Object.OverwriteFolder(this._folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), new SortedList<string, IFolderInfo>());
+            this.mockFolderManager.Object.OverwriteFolder(this.folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), new SortedList<string, IFolderInfo>());
 
             fileManager.Verify(fm => fm.MoveFile(It.IsAny<IFileInfo>(), destinationFolder), Times.Exactly(3));
         }
@@ -2220,25 +2232,25 @@ public void OverwriteFolder_Deletes_Source_Folder_In_Database()
             var fileManager = new Mock<IFileManager>();
             FileManager.RegisterInstance(fileManager.Object);
 
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var files = new List<IFileInfo>();
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(this._folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(this.folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
 
             var destinationFolder = new FolderInfo();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Verifiable();
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath)).Verifiable();
 
             var folderMapping = new FolderMappingInfo();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(false);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(false);
 
-            this._mockFolderManager.Object.OverwriteFolder(this._folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), new SortedList<string, IFolderInfo>());
+            this.mockFolderManager.Object.OverwriteFolder(this.folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), new SortedList<string, IFolderInfo>());
 
-            this._mockFolderManager.Verify();
+            this.mockFolderManager.Verify();
         }
 
         [Test]
@@ -2247,24 +2259,24 @@ public void OverwriteFolder_Adds_Folder_To_FoldersToDelete_If_FolderMapping_Is_E
             var fileManager = new Mock<IFileManager>();
             FileManager.RegisterInstance(fileManager.Object);
 
-            this._folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
-            this._folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
-            this._folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
+            this.folderInfo.Setup(fi => fi.PortalID).Returns(Constants.CONTENT_ValidPortalId);
+            this.folderInfo.Setup(fi => fi.FolderPath).Returns(Constants.FOLDER_ValidFolderRelativePath);
+            this.folderInfo.Setup(fi => fi.FolderMappingID).Returns(Constants.FOLDER_ValidFolderMappingID);
 
             var files = new List<IFileInfo>();
-            this._mockFolderManager.Setup(mfm => mfm.GetFiles(this._folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
+            this.mockFolderManager.Setup(mfm => mfm.GetFiles(this.folderInfo.Object, It.IsAny<bool>(), It.IsAny<bool>())).Returns(files);
 
             var destinationFolder = new FolderInfo();
 
-            this._mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
+            this.mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));
 
             var folderMapping = new FolderMappingInfo();
 
-            this._mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
-            this._mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(true);
+            this.mockFolderManager.Setup(mfm => mfm.GetFolderMapping(It.IsAny<Dictionary<int, FolderMappingInfo>>(), Constants.FOLDER_ValidFolderMappingID)).Returns(folderMapping);
+            this.mockFolderManager.Setup(mfm => mfm.IsFolderMappingEditable(folderMapping)).Returns(true);
 
             var foldersToDelete = new SortedList<string, IFolderInfo>();
-            this._mockFolderManager.Object.OverwriteFolder(this._folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), foldersToDelete);
+            this.mockFolderManager.Object.OverwriteFolder(this.folderInfo.Object, destinationFolder, new Dictionary<int, FolderMappingInfo>(), foldersToDelete);
 
             Assert.AreEqual(1, foldersToDelete.Count);
         }
@@ -2314,5 +2326,5 @@ public void OverwriteFolder_Adds_Folder_To_FoldersToDelete_If_FolderMapping_Is_E
 
         // _mockFolderManager.Verify();
         // }
-    }
-}
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/PreviewProfileControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/PreviewProfileControllerTests.cs
index 27124f48d3c..b35121031bc 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/PreviewProfileControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/PreviewProfileControllerTests.cs	
@@ -2,168 +2,188 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Services.Mobile
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Services.Mobile;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for PreviewProfileControllerTests.
-    /// </summary>
-    [TestFixture]
-    public class PreviewProfileControllerTests
-    {
-        private Mock<DataProvider> _dataProvider;
-
-        private DataTable _dtProfiles;
-
-        [SetUp]
-        public void SetUp()
-        {
-            ComponentFactory.Container = new SimpleContainer();
-            this._dataProvider = MockComponentProvider.CreateDataProvider();
-            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-            MockComponentProvider.CreateDataCacheProvider();
-            MockComponentProvider.CreateEventLogController();
-
-            this._dtProfiles = new DataTable("PreviewProfiles");
-            var pkCol = this._dtProfiles.Columns.Add("Id", typeof(int));
-            this._dtProfiles.Columns.Add("PortalId", typeof(int));
-            this._dtProfiles.Columns.Add("Name", typeof(string));
-            this._dtProfiles.Columns.Add("Width", typeof(int));
-            this._dtProfiles.Columns.Add("Height", typeof(int));
-            this._dtProfiles.Columns.Add("UserAgent", typeof(string));
-            this._dtProfiles.Columns.Add("SortOrder", typeof(int));
-
-            this._dtProfiles.PrimaryKey = new[] { pkCol };
-
-            this._dataProvider.Setup(d =>
-                                d.SavePreviewProfile(
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<string>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<string>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>())).Returns<int, int, string, int, int, string, int, int>(
-                                                            (id, portalId, name, width, height, userAgent, sortOrder, userId) =>
-                                                            {
-                                                                if (id == -1)
-                                                                {
-                                                                    if (this._dtProfiles.Rows.Count == 0)
-                                                                    {
-                                                                        id = 1;
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        id = Convert.ToInt32(this._dtProfiles.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
-                                                                    }
-
-                                                                    var row = this._dtProfiles.NewRow();
-                                                                    row["Id"] = id;
-                                                                    row["PortalId"] = portalId;
-                                                                    row["name"] = name;
-                                                                    row["width"] = width;
-                                                                    row["height"] = height;
-                                                                    row["useragent"] = userAgent;
-                                                                    row["sortorder"] = sortOrder;
-
-                                                                    this._dtProfiles.Rows.Add(row);
-                                                                }
-                                                                else
-                                                                {
-                                                                    var rows = this._dtProfiles.Select("Id = " + id);
-                                                                    if (rows.Length == 1)
-                                                                    {
-                                                                        var row = rows[0];
-
-                                                                        row["name"] = name;
-                                                                        row["width"] = width;
-                                                                        row["height"] = height;
-                                                                        row["useragent"] = userAgent;
-                                                                        row["sortorder"] = sortOrder;
-                                                                    }
-                                                                }
-
-                                                                return id;
-                                                            });
-
-            this._dataProvider.Setup(d => d.GetPreviewProfiles(It.IsAny<int>())).Returns<int>((portalId) => { return this.GetProfilesCallBack(portalId); });
-            this._dataProvider.Setup(d => d.DeletePreviewProfile(It.IsAny<int>())).Callback<int>((id) =>
-                                                                                            {
-                                                                                                var rows = this._dtProfiles.Select("Id = " + id);
-                                                                                                if (rows.Length == 1)
-                                                                                                {
-                                                                                                    this._dtProfiles.Rows.Remove(rows[0]);
-                                                                                                }
-                                                                                            });
-        }
-
-        [Test]
-        public void PreviewProfileController_Save_Valid_Profile()
-        {
-            var profile = new PreviewProfile { Name = "Test R", PortalId = 0, Width = 800, Height = 480 };
-            new PreviewProfileController().Save(profile);
-
-            var dataReader = this._dataProvider.Object.GetPreviewProfiles(0);
-            var affectedCount = 0;
-            while (dataReader.Read())
-            {
-                affectedCount++;
-            }
-
-            Assert.AreEqual(1, affectedCount);
-        }
-
-        [Test]
-        public void PreviewProfileController_GetProfilesByPortal_With_Valid_PortalID()
-        {
-            this.PrepareData();
-
-            IList<IPreviewProfile> list = new PreviewProfileController().GetProfilesByPortal(0);
-
-            Assert.AreEqual(3, list.Count);
-        }
-
-        [Test]
-        public void PreviewProfileController_Delete_With_ValidID()
-        {
-            this.PrepareData();
-            new PreviewProfileController().Delete(0, 1);
-
-            IList<IPreviewProfile> list = new PreviewProfileController().GetProfilesByPortal(0);
-
-            Assert.AreEqual(2, list.Count);
-        }
-
-        private IDataReader GetProfilesCallBack(int portalId)
-        {
-            var dtCheck = this._dtProfiles.Clone();
-            foreach (var row in this._dtProfiles.Select("PortalId = " + portalId))
-            {
-                dtCheck.Rows.Add(row.ItemArray);
-            }
-
-            return dtCheck.CreateDataReader();
-        }
-
-        private void PrepareData()
-        {
-            this._dtProfiles.Rows.Add(1, 0, "R1", 640, 480, string.Empty, 1);
-            this._dtProfiles.Rows.Add(2, 0, "R2", 640, 480, string.Empty, 2);
-            this._dtProfiles.Rows.Add(3, 0, "R3", 640, 480, string.Empty, 3);
-            this._dtProfiles.Rows.Add(4, 1, "R4", 640, 480, string.Empty, 4);
-            this._dtProfiles.Rows.Add(5, 1, "R5", 640, 480, string.Empty, 5);
-            this._dtProfiles.Rows.Add(6, 1, "R6", 640, 480, string.Empty, 6);
-        }
-    }
-}
+namespace DotNetNuke.Tests.Core.Services.Mobile
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Data;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Services.Mobile;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for PreviewProfileControllerTests.
+    /// </summary>
+    [TestFixture]
+    public class PreviewProfileControllerTests
+    {
+        private Mock<DataProvider> dataProvider;
+
+        private DataTable dtProfiles;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            ComponentFactory.Container = new SimpleContainer();
+            this.dataProvider = MockComponentProvider.CreateDataProvider();
+            this.dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+            MockComponentProvider.CreateDataCacheProvider();
+            MockComponentProvider.CreateEventLogController();
+
+            this.dtProfiles = new DataTable("PreviewProfiles");
+            var pkCol = this.dtProfiles.Columns.Add("Id", typeof(int));
+            this.dtProfiles.Columns.Add("PortalId", typeof(int));
+            this.dtProfiles.Columns.Add("Name", typeof(string));
+            this.dtProfiles.Columns.Add("Width", typeof(int));
+            this.dtProfiles.Columns.Add("Height", typeof(int));
+            this.dtProfiles.Columns.Add("UserAgent", typeof(string));
+            this.dtProfiles.Columns.Add("SortOrder", typeof(int));
+
+            this.dtProfiles.PrimaryKey = new[] { pkCol };
+
+            this.dataProvider.Setup(d =>
+                                d.SavePreviewProfile(
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<string>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<string>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>())).Returns<int, int, string, int, int, string, int, int>(
+                                                            (id, portalId, name, width, height, userAgent, sortOrder, userId) =>
+                                                            {
+                                                                if (id == -1)
+                                                                {
+                                                                    if (this.dtProfiles.Rows.Count == 0)
+                                                                    {
+                                                                        id = 1;
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        id = Convert.ToInt32(this.dtProfiles.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
+                                                                    }
+
+                                                                    var row = this.dtProfiles.NewRow();
+                                                                    row["Id"] = id;
+                                                                    row["PortalId"] = portalId;
+                                                                    row["name"] = name;
+                                                                    row["width"] = width;
+                                                                    row["height"] = height;
+                                                                    row["useragent"] = userAgent;
+                                                                    row["sortorder"] = sortOrder;
+
+                                                                    this.dtProfiles.Rows.Add(row);
+                                                                }
+                                                                else
+                                                                {
+                                                                    var rows = this.dtProfiles.Select("Id = " + id);
+                                                                    if (rows.Length == 1)
+                                                                    {
+                                                                        var row = rows[0];
+
+                                                                        row["name"] = name;
+                                                                        row["width"] = width;
+                                                                        row["height"] = height;
+                                                                        row["useragent"] = userAgent;
+                                                                        row["sortorder"] = sortOrder;
+                                                                    }
+                                                                }
+
+                                                                return id;
+                                                            });
+
+            this.dataProvider.Setup(d => d.GetPreviewProfiles(It.IsAny<int>())).Returns<int>((portalId) => { return this.GetProfilesCallBack(portalId); });
+            this.dataProvider.Setup(d => d.DeletePreviewProfile(It.IsAny<int>())).Callback<int>((id) =>
+                                                                                            {
+                                                                                                var rows = this.dtProfiles.Select("Id = " + id);
+                                                                                                if (rows.Length == 1)
+                                                                                                {
+                                                                                                    this.dtProfiles.Rows.Remove(rows[0]);
+                                                                                                }
+                                                                                            });
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+        }
+
+        [Test]
+        public void PreviewProfileController_Save_Valid_Profile()
+        {
+            var profile = new PreviewProfile { Name = "Test R", PortalId = 0, Width = 800, Height = 480 };
+            new PreviewProfileController().Save(profile);
+
+            var dataReader = this.dataProvider.Object.GetPreviewProfiles(0);
+            var affectedCount = 0;
+            while (dataReader.Read())
+            {
+                affectedCount++;
+            }
+
+            Assert.AreEqual(1, affectedCount);
+        }
+
+        [Test]
+        public void PreviewProfileController_GetProfilesByPortal_With_Valid_PortalID()
+        {
+            this.PrepareData();
+
+            IList<IPreviewProfile> list = new PreviewProfileController().GetProfilesByPortal(0);
+
+            Assert.AreEqual(3, list.Count);
+        }
+
+        [Test]
+        public void PreviewProfileController_Delete_With_ValidID()
+        {
+            this.PrepareData();
+            new PreviewProfileController().Delete(0, 1);
+
+            IList<IPreviewProfile> list = new PreviewProfileController().GetProfilesByPortal(0);
+
+            Assert.AreEqual(2, list.Count);
+        }
+
+        private IDataReader GetProfilesCallBack(int portalId)
+        {
+            var dtCheck = this.dtProfiles.Clone();
+            foreach (var row in this.dtProfiles.Select("PortalId = " + portalId))
+            {
+                dtCheck.Rows.Add(row.ItemArray);
+            }
+
+            return dtCheck.CreateDataReader();
+        }
+
+        private void PrepareData()
+        {
+            this.dtProfiles.Rows.Add(1, 0, "R1", 640, 480, string.Empty, 1);
+            this.dtProfiles.Rows.Add(2, 0, "R2", 640, 480, string.Empty, 2);
+            this.dtProfiles.Rows.Add(3, 0, "R3", 640, 480, string.Empty, 3);
+            this.dtProfiles.Rows.Add(4, 1, "R4", 640, 480, string.Empty, 4);
+            this.dtProfiles.Rows.Add(5, 1, "R5", 640, 480, string.Empty, 5);
+            this.dtProfiles.Rows.Add(6, 1, "R6", 640, 480, string.Empty, 6);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs
index e4cd277731a..afa656beecc 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs	
@@ -2,960 +2,962 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Services.Mobile
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.Data;
-    using System.Reflection;
-    using System.Web;
+namespace DotNetNuke.Tests.Core.Services.Mobile
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.Specialized;
+    using System.Data;
+    using System.Reflection;
+    using System.Web;
 
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Internal;
-    using DotNetNuke.ComponentModel;
-    using DotNetNuke.Data;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Security.Roles;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.ClientCapability;
-    using DotNetNuke.Services.Mobile;
-    using DotNetNuke.Tests.Core.Services.ClientCapability;
-    using DotNetNuke.Tests.Instance.Utilities;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Internal;
+    using DotNetNuke.ComponentModel;
+    using DotNetNuke.Data;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Security.Roles;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.ClientCapability;
+    using DotNetNuke.Services.Mobile;
+    using DotNetNuke.Tests.Core.Services.ClientCapability;
+    using DotNetNuke.Tests.Instance.Utilities;
     using DotNetNuke.Tests.Utilities.Mocks;
+
     using Microsoft.Extensions.DependencyInjection;
-    using Moq;
-    using NUnit.Framework;
-
-    /// <summary>
-    ///   Summary description for RedirectionControllerTests.
-    /// </summary>
-    [TestFixture]
-    public class RedirectionControllerTests
-    {
-        public const string iphoneUserAgent = "Mozilla/5.0 (iPod; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-        public const string wp7UserAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) Asus;Galaxy6";
-        public const string msIE8UserAgent = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; InfoPath.3; Creative AutoUpdate v1.40.02)";
-        public const string msIE9UserAgent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)";
-        public const string msIE10UserAgent = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)";
-        public const string fireFox5NT61UserAgent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:5.0) Gecko/20110619 Firefox/5.0";
-        public const string iPadTabletUserAgent = "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10";
-        public const string samsungGalaxyTablet = "Mozilla/5.0 (Linux; U; Android 2.2; en-gb; SAMSUNG GT-P1000 Tablet Build/MASTER) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
-        public const string winTabletPC = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.3705; Tablet PC 2.0)";
-        public const string htcDesireVer1Sub22UserAgent = "Mozilla/5.0 (Linux; U; Android 2.2; sv-se; Desire_A8181 Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
-        public const string blackBerry9105V1 = "BlackBerry9105/5.0.0.696 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/133";
-        public const string motorolaRIZRSymbianOSOpera865 = "MOTORIZR-Z8/46.00.00 Mozilla/4.0 (compatible; MSIE 6.0; Symbian OS; 356) Opera 8.65 [it] UP.Link/6.3.0.0.0";
-
-        public const int Portal0 = 0;
-        public const int Portal1 = 1;
-        public const int Portal2 = 2;
-        public const int Page1 = 1;
-        public const int Page2 = 2;
-        public const int Page3 = 3;
-        public const int SortOrder1 = 1;
-        public const int SortOrder2 = 1;
-        public const int SortOrder3 = 1;
-        public const string PortalAlias0 = "www.portal0.com";
-        public const string PortalAlias1 = "www.portal1.com";
-        public const int AnotherPageOnSamePortal = 56;
-        public const int DeletedPageOnSamePortal = 59;
-        public const int DeletedPageOnSamePortal2 = 94;
-        public const int HomePageOnPortal0 = 55;
-        public const int HomePageOnPortal1 = 57;
-        public const int MobileLandingPage = 91;
-        public const int TabletLandingPage = 92;
-        public const int AllMobileLandingPage = 93;
-        public const bool EnabledFlag = true;
-        public const bool DisabledFlag = false;
-        public const bool IncludeChildTabsFlag = true;
-        public const string ExternalSite = "https://dnncommunity.org";
-
-        private const string DisableMobileRedirectCookieName = "disablemobileredirect";
-        private const string DisableRedirectPresistCookieName = "disableredirectpresist";
-        private const string DisableMobileRedirectQueryStringName = "nomo";
-
-        private Mock<DataProvider> _dataProvider;
-        private RedirectionController _redirectionController;
-        private Mock<ClientCapabilityProvider> _clientCapabilityProvider;
-        private Mock<IHostController> _mockHostController;
-
-        private DataTable _dtRedirections;
-        private DataTable _dtRules;
-
-        [SetUp]
-        public void SetUp()
-        {
-            this.SetupContianer();
-            ComponentFactory.Container = new SimpleContainer();
-            UnitTestHelper.ClearHttpContext();
-            this._dataProvider = MockComponentProvider.CreateDataProvider();
-            MockComponentProvider.CreateDataCacheProvider();
-            MockComponentProvider.CreateEventLogController();
-            this._clientCapabilityProvider = MockComponentProvider.CreateNew<ClientCapabilityProvider>();
-            this._mockHostController = new Mock<IHostController>();
-            HostController.RegisterInstance(this._mockHostController.Object);
-
-            this._redirectionController = new RedirectionController();
-
-            this.SetupDataProvider();
-            this.SetupClientCapabilityProvider();
-            this.SetupRoleProvider();
-
-            var tabController = TabController.Instance;
-            var dataProviderField = tabController.GetType().GetField("_dataProvider", BindingFlags.NonPublic | BindingFlags.Instance);
-            if (dataProviderField != null)
-            {
-                dataProviderField.SetValue(tabController, this._dataProvider.Object);
-            }
-
-            
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            Globals.DependencyProvider = null;
-            TestableGlobals.ClearInstance();
-            PortalController.ClearInstance();
-            CachingProvider.Instance().PurgeCache();
-            MockComponentProvider.ResetContainer();
-            UnitTestHelper.ClearHttpContext();
-            if (this._dtRedirections != null)
-            {
-                this._dtRedirections.Dispose();
-                this._dtRedirections = null;
-            }
-
-            if (this._dtRules != null)
-            {
-                this._dtRules.Dispose();
-                this._dtRules = null;
-            }
-
-            ComponentFactory.Container = null;
-        }
-
-        [Test]
-        public void RedirectionController_Save_Valid_Redirection()
-        {
-            var redirection = new Redirection { Name = "Test R", PortalId = Portal0, SortOrder = 1, SourceTabId = -1, Type = RedirectionType.MobilePhone, TargetType = TargetType.Portal, TargetValue = Portal1 };
-            this._redirectionController.Save(redirection);
-
-            var dataReader = this._dataProvider.Object.GetRedirections(Portal0);
-            var affectedCount = 0;
-            while (dataReader.Read())
-            {
-                affectedCount++;
-            }
-
-            Assert.AreEqual(1, affectedCount);
-        }
-
-        [Test]
-        public void RedirectionController_Save_ValidRedirection_With_Rules()
-        {
-            var redirection = new Redirection { Name = "Test R", PortalId = Portal0, SortOrder = 1, SourceTabId = -1, IncludeChildTabs = true, Type = RedirectionType.Other, TargetType = TargetType.Portal, TargetValue = Portal1 };
-            redirection.MatchRules.Add(new MatchRule { Capability = "Platform", Expression = "IOS" });
-            redirection.MatchRules.Add(new MatchRule { Capability = "Version", Expression = "5" });
-            this._redirectionController.Save(redirection);
-
-            var dataReader = this._dataProvider.Object.GetRedirections(Portal0);
-            var affectedCount = 0;
-            while (dataReader.Read())
-            {
-                affectedCount++;
-            }
-
-            Assert.AreEqual(1, affectedCount);
-
-            var getRe = this._redirectionController.GetRedirectionsByPortal(Portal0)[0];
-            Assert.AreEqual(2, getRe.MatchRules.Count);
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionsByPortal_With_Valid_PortalID()
-        {
-            this.PrepareData();
-
-            IList<IRedirection> list = this._redirectionController.GetRedirectionsByPortal(Portal0);
-
-            Assert.AreEqual(7, list.Count);
-        }
-
-        [Test]
-        public void RedirectionController_Delete_With_ValidID()
-        {
-            this.PrepareData();
-            this._redirectionController.Delete(Portal0, 1);
-
-            IList<IRedirection> list = this._redirectionController.GetRedirectionsByPortal(Portal0);
-
-            Assert.AreEqual(6, list.Count);
-        }
-
-        [Test]
-        public void RedirectionController_PurgeInvalidRedirections_DoNotPurgeRuleForNonDeletetedSource()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
-            this._redirectionController.PurgeInvalidRedirections(0);
-            Assert.AreEqual(1, this._redirectionController.GetRedirectionsByPortal(0).Count);
-        }
-
-        [Test]
-        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedSource()
-        {
-            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, DeletedPageOnSamePortal2, IncludeChildTabsFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag });
-            this._redirectionController.PurgeInvalidRedirections(0);
-            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
-        }
-
-        [Test]
-        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedTargetPortal()
-        {
-            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Portal, Portal2, EnabledFlag });
-            this._redirectionController.PurgeInvalidRedirections(0);
-            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
-        }
-
-        [Test]
-        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedTargetTab()
-        {
-            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Tab, DeletedPageOnSamePortal2, EnabledFlag });
-            this._redirectionController.PurgeInvalidRedirections(0);
-            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
-        }
-
-        [Test]
-        [ExpectedException(typeof(ArgumentException))]
-        public void RedirectionController_GetRedirectionUrl_Throws_On_Null_UserAgent()
-        {
-            this._redirectionController.GetRedirectUrl(null, Portal0, 0);
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Redirection_IsNotSet()
-        {
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, HomePageOnPortal0));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Redirection_IsNotEnabled()
-        {
-            this.PrepareSingleDisabledRedirectionRule();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, HomePageOnPortal0));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_UserAgent_Is_Desktop()
-        {
-            this.PrepareData();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(msIE9UserAgent, Portal0, HomePageOnPortal0));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_CurrentPage_IsSameAs_TargetPage_OnMobile()
-        {
-            this.PreparePortalToAnotherPageOnSamePortal();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_TargetPage_IsDeleted()
-        {
-            // prepare rule to a deleted tab on the same portal
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, AnotherPageOnSamePortal, EnabledFlag, (int)TargetType.Tab, DeletedPageOnSamePortal, 1);
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_CurrentPortal_IsSameAs_TargetPortal_OnMobile()
-        {
-            this.PrepareSamePortalToSamePortalRedirectionRule();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_TargetPageOnSamePortal_When_Surfing_HomePage_OnMobile()
-        {
-            this.PreparePortalToAnotherPageOnSamePortal();
-            Assert.AreEqual(this.NavigateUrl(AnotherPageOnSamePortal), this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-        }
-
-        // [Test]
-        // public void RedirectionController_GetRedirectionUrl_Returns_HomePageOfOtherPortal_When_Surfing_AnyPageOfCurrentPortal_OnMobile()
-        // {
-        //    PrepareHomePageToHomePageRedirectionRule();
-        //    Assert.AreEqual(DotNetNuke.Common.Globals.AddHTTP(PortalAlias1), _redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-        //    Assert.AreEqual(DotNetNuke.Common.Globals.AddHTTP(PortalAlias1), _redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 2));
-        // }
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_ExternalSite_When_Surfing_AnyPageOfCurrentPortal_OnMobile()
-        {
-            this.PrepareExternalSiteRedirectionRule();
-            Assert.AreEqual(ExternalSite, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-            Assert.AreEqual(ExternalSite, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 2));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_MobileLanding_ForMobile_And_TabletLanding_ForTablet()
-        {
-            this.PrepareMobileAndTabletRedirectionRuleWithMobileFirst();
-            Assert.AreEqual(this.NavigateUrl(MobileLandingPage), this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-            Assert.AreEqual(this.NavigateUrl(TabletLandingPage), this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, Portal0, 1));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_TabletLanding_ForTablet_And_MobileLanding_ForMobile()
-        {
-            this.PrepareMobileAndTabletRedirectionRuleWithAndTabletRedirectionRuleTabletFirst();
-            Assert.AreEqual(this.NavigateUrl(MobileLandingPage), this._redirectionController.GetRedirectUrl(iphoneUserAgent, 0, 1));
-            Assert.AreEqual(this.NavigateUrl(TabletLandingPage), this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, 0, 1));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_SameLandingPage_For_AllMobile()
-        {
-            this.PrepareAllMobileRedirectionRule();
-            string mobileLandingPage = this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1);
-            string tabletLandingPage = this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, Portal0, 1);
-            Assert.AreEqual(this.NavigateUrl(AllMobileLandingPage), mobileLandingPage);
-            Assert.AreEqual(this.NavigateUrl(AllMobileLandingPage), tabletLandingPage);
-            Assert.AreEqual(mobileLandingPage, tabletLandingPage);
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Capability_DoesNot_Match()
-        {
-            this.PrepareOperaBrowserOnSymbianOSRedirectionRule();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_ValidUrl_When_Capability_Matches()
-        {
-            this.PrepareOperaBrowserOnSymbianOSRedirectionRule();
-            Assert.AreEqual(this.NavigateUrl(AnotherPageOnSamePortal), this._redirectionController.GetRedirectUrl(motorolaRIZRSymbianOSOpera865, Portal0, 1));
-        }
-
-        [Test]
-        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_NotAll_Capability_Matches()
-        {
-            this.PrepareOperaBrowserOnIPhoneOSRedirectionRule();
-            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
-        }
-
-        [Test]
-        public void RedirectionController_GetFullSiteUrl_With_NoRedirections()
-        {
-            var url = this._redirectionController.GetFullSiteUrl(Portal0, HomePageOnPortal0);
-
-            Assert.AreEqual(string.Empty, url);
-        }
-
-        // [Test]
-        // public void RedirectionController_GetFullSiteUrl_When_Redirect_Between_Different_Portals()
-        // {
-        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, "1", 1);
-
-        // var url = _redirectionController.GetFullSiteUrl(Portal1, HomePageOnPortal1);
-
-        // Assert.AreEqual(Globals.AddHTTP(PortalAlias0), url);
-        // }
-
-        // [Test]
-        // public void RedirectionController_GetFullSiteUrl_When_Redirect_In_Same_Portal()
-        // {
-        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, 1);
-
-        // var url = _redirectionController.GetFullSiteUrl(Portal1, AnotherPageOnSamePortal);
-
-        // //Assert.AreEqual(string.Empty, url);
-        // }
-        [Test]
-        public void RedirectionController_GetFullSiteUrl_When_Redirect_To_DifferentUrl()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Url, ExternalSite, 1);
-
-            var url = this._redirectionController.GetFullSiteUrl(Portal1, AnotherPageOnSamePortal);
-
-            Assert.AreEqual(string.Empty, url);
-        }
-
-        [Test]
-        public void RedirectionController_GetMobileSiteUrl_With_NoRedirections()
-        {
-            var url = this._redirectionController.GetMobileSiteUrl(Portal0, HomePageOnPortal0);
-
-            Assert.AreEqual(string.Empty, url);
-        }
-
-        [Test]
-        public void RedirectionController_GetMobileSiteUrl_Returns_Page_Specific_Url_When_Multiple_PageLevel_Redirects_Defined()
-        {
-            string redirectUrlPage1 = "m.yahoo.com";
-            string redirectUrlPage2 = "m.cnn.com";
-
-            // first page goes to one url
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, Page1, EnabledFlag, (int)TargetType.Url, redirectUrlPage1, 1);
-
-            // second page goes to another url (this is Tablet - it should not matter)
-            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, Page2, EnabledFlag, (int)TargetType.Url, redirectUrlPage2, 1);
-
-            var mobileUrlForPage1 = this._redirectionController.GetMobileSiteUrl(Portal0, Page1);
-            var mobileUrlForPage2 = this._redirectionController.GetMobileSiteUrl(Portal0, Page2);
-            var mobileUrlForPage3 = this._redirectionController.GetMobileSiteUrl(Portal0, Page3);
-
-            // First Page returns link to first url
-            Assert.AreEqual(string.Format("{0}?nomo=0", redirectUrlPage1), mobileUrlForPage1);
-
-            // Second Page returns link to second url
-            Assert.AreEqual(string.Format("{0}?nomo=0", redirectUrlPage2), mobileUrlForPage2);
-
-            // Third Page returns link to first url - as this is the first found url and third page has no redirect defined
-            Assert.AreEqual(mobileUrlForPage3, string.Format("{0}?nomo=0", redirectUrlPage1));
-        }
-
-        // [Test]
-        // public void RedirectionController_GetMobileSiteUrl_Works_When_Page_Redirects_To_Another_Portal()
-        // {
-        //    //first page goes to one second portal
-        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, Portal1, 1);
-
-        // var mobileUrlForPage1 = _redirectionController.GetMobileSiteUrl(Portal0, Page1);
-
-        // //First Page returns link to home page of other portal
-        //    Assert.AreEqual(Globals.AddHTTP(PortalAlias1), mobileUrlForPage1);
-        // }
-        [Test]
-        public void RedirectionController_GetMobileSiteUrl_When_Redirect_To_DifferentUrl()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Url, ExternalSite, 1);
-
-            var url = this._redirectionController.GetMobileSiteUrl(Portal1, AnotherPageOnSamePortal);
-
-            Assert.AreEqual(string.Empty, url);
-        }
-
-        [Test]
-        public void RedirectionController_IsRedirectAllowedForTheSession_In_Normal_Action()
-        {
-            var app = this.GenerateApplication();
-
-            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
-        }
-
-        [Test]
-        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_1()
-        {
-            var app = this.GenerateApplication();
-            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "1");
-
-            Assert.IsFalse(this._redirectionController.IsRedirectAllowedForTheSession(app));
-            Assert.IsNotNull(app.Request.Cookies[DisableMobileRedirectCookieName]);
-            Assert.IsNotNull(app.Request.Cookies[DisableRedirectPresistCookieName]);
-        }
-
-        [Test]
-        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_0()
-        {
-            var app = this.GenerateApplication();
-            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "0");
-
-            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
-        }
-
-        [Test]
-        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_1_And_Then_Setback_To_0()
-        {
-            var app = this.GenerateApplication();
-            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "1");
-            Assert.IsFalse(this._redirectionController.IsRedirectAllowedForTheSession(app));
-
-            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "0");
-            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
-        }
-
-        private void SetupContianer()
-        {
-            var serviceCollection = new ServiceCollection();
-
-            var mockNavigationManager = new Mock<INavigationManager>();
-            mockNavigationManager.Setup(x => x.NavigateURL(It.IsAny<int>())).Returns<int>(x => this.NavigateUrl(x));
-
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    /// <summary>
+    ///   Summary description for RedirectionControllerTests.
+    /// </summary>
+    [TestFixture]
+    public class RedirectionControllerTests
+    {
+        public const string iphoneUserAgent = "Mozilla/5.0 (iPod; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
+        public const string wp7UserAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) Asus;Galaxy6";
+        public const string msIE8UserAgent = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; InfoPath.3; Creative AutoUpdate v1.40.02)";
+        public const string msIE9UserAgent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)";
+        public const string msIE10UserAgent = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)";
+        public const string fireFox5NT61UserAgent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:5.0) Gecko/20110619 Firefox/5.0";
+        public const string iPadTabletUserAgent = "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10";
+        public const string samsungGalaxyTablet = "Mozilla/5.0 (Linux; U; Android 2.2; en-gb; SAMSUNG GT-P1000 Tablet Build/MASTER) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
+        public const string winTabletPC = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.3705; Tablet PC 2.0)";
+        public const string htcDesireVer1Sub22UserAgent = "Mozilla/5.0 (Linux; U; Android 2.2; sv-se; Desire_A8181 Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
+        public const string blackBerry9105V1 = "BlackBerry9105/5.0.0.696 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/133";
+        public const string motorolaRIZRSymbianOSOpera865 = "MOTORIZR-Z8/46.00.00 Mozilla/4.0 (compatible; MSIE 6.0; Symbian OS; 356) Opera 8.65 [it] UP.Link/6.3.0.0.0";
+
+        public const int Portal0 = 0;
+        public const int Portal1 = 1;
+        public const int Portal2 = 2;
+        public const int Page1 = 1;
+        public const int Page2 = 2;
+        public const int Page3 = 3;
+        public const int SortOrder1 = 1;
+        public const int SortOrder2 = 1;
+        public const int SortOrder3 = 1;
+        public const string PortalAlias0 = "www.portal0.com";
+        public const string PortalAlias1 = "www.portal1.com";
+        public const int AnotherPageOnSamePortal = 56;
+        public const int DeletedPageOnSamePortal = 59;
+        public const int DeletedPageOnSamePortal2 = 94;
+        public const int HomePageOnPortal0 = 55;
+        public const int HomePageOnPortal1 = 57;
+        public const int MobileLandingPage = 91;
+        public const int TabletLandingPage = 92;
+        public const int AllMobileLandingPage = 93;
+        public const bool EnabledFlag = true;
+        public const bool DisabledFlag = false;
+        public const bool IncludeChildTabsFlag = true;
+        public const string ExternalSite = "https://dnncommunity.org";
+
+        private const string DisableMobileRedirectCookieName = "disablemobileredirect";
+        private const string DisableRedirectPresistCookieName = "disableredirectpresist";
+        private const string DisableMobileRedirectQueryStringName = "nomo";
+
+        private Mock<DataProvider> _dataProvider;
+        private RedirectionController _redirectionController;
+        private Mock<ClientCapabilityProvider> _clientCapabilityProvider;
+        private Mock<IHostController> _mockHostController;
+
+        private DataTable _dtRedirections;
+        private DataTable _dtRules;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.SetupContianer();
+            ComponentFactory.Container = new SimpleContainer();
+            UnitTestHelper.ClearHttpContext();
+            this._dataProvider = MockComponentProvider.CreateDataProvider();
+            MockComponentProvider.CreateDataCacheProvider();
+            MockComponentProvider.CreateEventLogController();
+            this._clientCapabilityProvider = MockComponentProvider.CreateNew<ClientCapabilityProvider>();
+            this._mockHostController = new Mock<IHostController>();
+            HostController.RegisterInstance(this._mockHostController.Object);
+
+            this._redirectionController = new RedirectionController();
+
+            this.SetupDataProvider();
+            this.SetupClientCapabilityProvider();
+            this.SetupRoleProvider();
+
+            var tabController = TabController.Instance;
+            var dataProviderField = tabController.GetType().GetField("_dataProvider", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (dataProviderField != null)
+            {
+                dataProviderField.SetValue(tabController, this._dataProvider.Object);
+            }
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            TestableGlobals.ClearInstance();
+            PortalController.ClearInstance();
+            CachingProvider.Instance().PurgeCache();
+            MockComponentProvider.ResetContainer();
+            UnitTestHelper.ClearHttpContext();
+            if (this._dtRedirections != null)
+            {
+                this._dtRedirections.Dispose();
+                this._dtRedirections = null;
+            }
+
+            if (this._dtRules != null)
+            {
+                this._dtRules.Dispose();
+                this._dtRules = null;
+            }
+
+            ComponentFactory.Container = null;
+        }
+
+        [Test]
+        public void RedirectionController_Save_Valid_Redirection()
+        {
+            var redirection = new Redirection { Name = "Test R", PortalId = Portal0, SortOrder = 1, SourceTabId = -1, Type = RedirectionType.MobilePhone, TargetType = TargetType.Portal, TargetValue = Portal1 };
+            this._redirectionController.Save(redirection);
+
+            var dataReader = this._dataProvider.Object.GetRedirections(Portal0);
+            var affectedCount = 0;
+            while (dataReader.Read())
+            {
+                affectedCount++;
+            }
+
+            Assert.AreEqual(1, affectedCount);
+        }
+
+        [Test]
+        public void RedirectionController_Save_ValidRedirection_With_Rules()
+        {
+            var redirection = new Redirection { Name = "Test R", PortalId = Portal0, SortOrder = 1, SourceTabId = -1, IncludeChildTabs = true, Type = RedirectionType.Other, TargetType = TargetType.Portal, TargetValue = Portal1 };
+            redirection.MatchRules.Add(new MatchRule { Capability = "Platform", Expression = "IOS" });
+            redirection.MatchRules.Add(new MatchRule { Capability = "Version", Expression = "5" });
+            this._redirectionController.Save(redirection);
+
+            var dataReader = this._dataProvider.Object.GetRedirections(Portal0);
+            var affectedCount = 0;
+            while (dataReader.Read())
+            {
+                affectedCount++;
+            }
+
+            Assert.AreEqual(1, affectedCount);
+
+            var getRe = this._redirectionController.GetRedirectionsByPortal(Portal0)[0];
+            Assert.AreEqual(2, getRe.MatchRules.Count);
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionsByPortal_With_Valid_PortalID()
+        {
+            this.PrepareData();
+
+            IList<IRedirection> list = this._redirectionController.GetRedirectionsByPortal(Portal0);
+
+            Assert.AreEqual(7, list.Count);
+        }
+
+        [Test]
+        public void RedirectionController_Delete_With_ValidID()
+        {
+            this.PrepareData();
+            this._redirectionController.Delete(Portal0, 1);
+
+            IList<IRedirection> list = this._redirectionController.GetRedirectionsByPortal(Portal0);
+
+            Assert.AreEqual(6, list.Count);
+        }
+
+        [Test]
+        public void RedirectionController_PurgeInvalidRedirections_DoNotPurgeRuleForNonDeletetedSource()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
+            this._redirectionController.PurgeInvalidRedirections(0);
+            Assert.AreEqual(1, this._redirectionController.GetRedirectionsByPortal(0).Count);
+        }
+
+        [Test]
+        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedSource()
+        {
+            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, DeletedPageOnSamePortal2, IncludeChildTabsFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag });
+            this._redirectionController.PurgeInvalidRedirections(0);
+            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
+        }
+
+        [Test]
+        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedTargetPortal()
+        {
+            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Portal, Portal2, EnabledFlag });
+            this._redirectionController.PurgeInvalidRedirections(0);
+            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
+        }
+
+        [Test]
+        public void RedirectionController_PurgeInvalidRedirections_DoPurgeRuleForDeletetedTargetTab()
+        {
+            this._dtRedirections.Rows.Add(new object[] { 1, Portal0, "R1", (int)RedirectionType.MobilePhone, SortOrder1, HomePageOnPortal0, IncludeChildTabsFlag, (int)TargetType.Tab, DeletedPageOnSamePortal2, EnabledFlag });
+            this._redirectionController.PurgeInvalidRedirections(0);
+            Assert.AreEqual(0, this._redirectionController.GetRedirectionsByPortal(0).Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void RedirectionController_GetRedirectionUrl_Throws_On_Null_UserAgent()
+        {
+            this._redirectionController.GetRedirectUrl(null, Portal0, 0);
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Redirection_IsNotSet()
+        {
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, HomePageOnPortal0));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Redirection_IsNotEnabled()
+        {
+            this.PrepareSingleDisabledRedirectionRule();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, HomePageOnPortal0));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_UserAgent_Is_Desktop()
+        {
+            this.PrepareData();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(msIE9UserAgent, Portal0, HomePageOnPortal0));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_CurrentPage_IsSameAs_TargetPage_OnMobile()
+        {
+            this.PreparePortalToAnotherPageOnSamePortal();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_TargetPage_IsDeleted()
+        {
+            // prepare rule to a deleted tab on the same portal
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, AnotherPageOnSamePortal, EnabledFlag, (int)TargetType.Tab, DeletedPageOnSamePortal, 1);
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_CurrentPortal_IsSameAs_TargetPortal_OnMobile()
+        {
+            this.PrepareSamePortalToSamePortalRedirectionRule();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, AnotherPageOnSamePortal));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_TargetPageOnSamePortal_When_Surfing_HomePage_OnMobile()
+        {
+            this.PreparePortalToAnotherPageOnSamePortal();
+            Assert.AreEqual(this.NavigateUrl(AnotherPageOnSamePortal), this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+        }
+
+        // [Test]
+        // public void RedirectionController_GetRedirectionUrl_Returns_HomePageOfOtherPortal_When_Surfing_AnyPageOfCurrentPortal_OnMobile()
+        // {
+        //    PrepareHomePageToHomePageRedirectionRule();
+        //    Assert.AreEqual(DotNetNuke.Common.Globals.AddHTTP(PortalAlias1), _redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+        //    Assert.AreEqual(DotNetNuke.Common.Globals.AddHTTP(PortalAlias1), _redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 2));
+        // }
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_ExternalSite_When_Surfing_AnyPageOfCurrentPortal_OnMobile()
+        {
+            this.PrepareExternalSiteRedirectionRule();
+            Assert.AreEqual(ExternalSite, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+            Assert.AreEqual(ExternalSite, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 2));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_MobileLanding_ForMobile_And_TabletLanding_ForTablet()
+        {
+            this.PrepareMobileAndTabletRedirectionRuleWithMobileFirst();
+            Assert.AreEqual(this.NavigateUrl(MobileLandingPage), this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+            Assert.AreEqual(this.NavigateUrl(TabletLandingPage), this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, Portal0, 1));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_TabletLanding_ForTablet_And_MobileLanding_ForMobile()
+        {
+            this.PrepareMobileAndTabletRedirectionRuleWithAndTabletRedirectionRuleTabletFirst();
+            Assert.AreEqual(this.NavigateUrl(MobileLandingPage), this._redirectionController.GetRedirectUrl(iphoneUserAgent, 0, 1));
+            Assert.AreEqual(this.NavigateUrl(TabletLandingPage), this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, 0, 1));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_SameLandingPage_For_AllMobile()
+        {
+            this.PrepareAllMobileRedirectionRule();
+            string mobileLandingPage = this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1);
+            string tabletLandingPage = this._redirectionController.GetRedirectUrl(iPadTabletUserAgent, Portal0, 1);
+            Assert.AreEqual(this.NavigateUrl(AllMobileLandingPage), mobileLandingPage);
+            Assert.AreEqual(this.NavigateUrl(AllMobileLandingPage), tabletLandingPage);
+            Assert.AreEqual(mobileLandingPage, tabletLandingPage);
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_Capability_DoesNot_Match()
+        {
+            this.PrepareOperaBrowserOnSymbianOSRedirectionRule();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_ValidUrl_When_Capability_Matches()
+        {
+            this.PrepareOperaBrowserOnSymbianOSRedirectionRule();
+            Assert.AreEqual(this.NavigateUrl(AnotherPageOnSamePortal), this._redirectionController.GetRedirectUrl(motorolaRIZRSymbianOSOpera865, Portal0, 1));
+        }
+
+        [Test]
+        public void RedirectionController_GetRedirectionUrl_Returns_EmptyString_When_NotAll_Capability_Matches()
+        {
+            this.PrepareOperaBrowserOnIPhoneOSRedirectionRule();
+            Assert.AreEqual(string.Empty, this._redirectionController.GetRedirectUrl(iphoneUserAgent, Portal0, 1));
+        }
+
+        [Test]
+        public void RedirectionController_GetFullSiteUrl_With_NoRedirections()
+        {
+            var url = this._redirectionController.GetFullSiteUrl(Portal0, HomePageOnPortal0);
+
+            Assert.AreEqual(string.Empty, url);
+        }
+
+        // [Test]
+        // public void RedirectionController_GetFullSiteUrl_When_Redirect_Between_Different_Portals()
+        // {
+        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, "1", 1);
+
+        // var url = _redirectionController.GetFullSiteUrl(Portal1, HomePageOnPortal1);
+
+        // Assert.AreEqual(Globals.AddHTTP(PortalAlias0), url);
+        // }
+
+        // [Test]
+        // public void RedirectionController_GetFullSiteUrl_When_Redirect_In_Same_Portal()
+        // {
+        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, 1);
+
+        // var url = _redirectionController.GetFullSiteUrl(Portal1, AnotherPageOnSamePortal);
+
+        // //Assert.AreEqual(string.Empty, url);
+        // }
+        [Test]
+        public void RedirectionController_GetFullSiteUrl_When_Redirect_To_DifferentUrl()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Url, ExternalSite, 1);
+
+            var url = this._redirectionController.GetFullSiteUrl(Portal1, AnotherPageOnSamePortal);
+
+            Assert.AreEqual(string.Empty, url);
+        }
+
+        [Test]
+        public void RedirectionController_GetMobileSiteUrl_With_NoRedirections()
+        {
+            var url = this._redirectionController.GetMobileSiteUrl(Portal0, HomePageOnPortal0);
+
+            Assert.AreEqual(string.Empty, url);
+        }
+
+        [Test]
+        public void RedirectionController_GetMobileSiteUrl_Returns_Page_Specific_Url_When_Multiple_PageLevel_Redirects_Defined()
+        {
+            string redirectUrlPage1 = "m.yahoo.com";
+            string redirectUrlPage2 = "m.cnn.com";
+
+            // first page goes to one url
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, Page1, EnabledFlag, (int)TargetType.Url, redirectUrlPage1, 1);
+
+            // second page goes to another url (this is Tablet - it should not matter)
+            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, Page2, EnabledFlag, (int)TargetType.Url, redirectUrlPage2, 1);
+
+            var mobileUrlForPage1 = this._redirectionController.GetMobileSiteUrl(Portal0, Page1);
+            var mobileUrlForPage2 = this._redirectionController.GetMobileSiteUrl(Portal0, Page2);
+            var mobileUrlForPage3 = this._redirectionController.GetMobileSiteUrl(Portal0, Page3);
+
+            // First Page returns link to first url
+            Assert.AreEqual(string.Format("{0}?nomo=0", redirectUrlPage1), mobileUrlForPage1);
+
+            // Second Page returns link to second url
+            Assert.AreEqual(string.Format("{0}?nomo=0", redirectUrlPage2), mobileUrlForPage2);
+
+            // Third Page returns link to first url - as this is the first found url and third page has no redirect defined
+            Assert.AreEqual(mobileUrlForPage3, string.Format("{0}?nomo=0", redirectUrlPage1));
+        }
+
+        // [Test]
+        // public void RedirectionController_GetMobileSiteUrl_Works_When_Page_Redirects_To_Another_Portal()
+        // {
+        //    //first page goes to one second portal
+        //    _dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, Portal1, 1);
+
+        // var mobileUrlForPage1 = _redirectionController.GetMobileSiteUrl(Portal0, Page1);
+
+        // //First Page returns link to home page of other portal
+        //    Assert.AreEqual(Globals.AddHTTP(PortalAlias1), mobileUrlForPage1);
+        // }
+        [Test]
+        public void RedirectionController_GetMobileSiteUrl_When_Redirect_To_DifferentUrl()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, HomePageOnPortal0, EnabledFlag, (int)TargetType.Url, ExternalSite, 1);
+
+            var url = this._redirectionController.GetMobileSiteUrl(Portal1, AnotherPageOnSamePortal);
+
+            Assert.AreEqual(string.Empty, url);
+        }
+
+        [Test]
+        public void RedirectionController_IsRedirectAllowedForTheSession_In_Normal_Action()
+        {
+            var app = this.GenerateApplication();
+
+            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
+        }
+
+        [Test]
+        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_1()
+        {
+            var app = this.GenerateApplication();
+            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "1");
+
+            Assert.IsFalse(this._redirectionController.IsRedirectAllowedForTheSession(app));
+            Assert.IsNotNull(app.Request.Cookies[DisableMobileRedirectCookieName]);
+            Assert.IsNotNull(app.Request.Cookies[DisableRedirectPresistCookieName]);
+        }
+
+        [Test]
+        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_0()
+        {
+            var app = this.GenerateApplication();
+            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "0");
+
+            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
+        }
+
+        [Test]
+        public void RedirectionController_IsRedirectAllowedForTheSession_With_Nonmo_Param_Set_To_1_And_Then_Setback_To_0()
+        {
+            var app = this.GenerateApplication();
+            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "1");
+            Assert.IsFalse(this._redirectionController.IsRedirectAllowedForTheSession(app));
+
+            app.Context.Request.QueryString.Add(DisableMobileRedirectQueryStringName, "0");
+            Assert.IsTrue(this._redirectionController.IsRedirectAllowedForTheSession(app));
+        }
+
+        private void SetupContianer()
+        {
+            var serviceCollection = new ServiceCollection();
+
+            var mockNavigationManager = new Mock<INavigationManager>();
+            mockNavigationManager.Setup(x => x.NavigateURL(It.IsAny<int>())).Returns<int>(x => this.NavigateUrl(x));
+
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
 
             serviceCollection.AddTransient<INavigationManager>(container => mockNavigationManager.Object);
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
-
-            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
-        }
-
-        private void SetupDataProvider()
-        {
-            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
-
-            this._dtRedirections = new DataTable("Redirections");
-            var pkCol = this._dtRedirections.Columns.Add("Id", typeof(int));
-            this._dtRedirections.Columns.Add("PortalId", typeof(int));
-            this._dtRedirections.Columns.Add("Name", typeof(string));
-            this._dtRedirections.Columns.Add("Type", typeof(int));
-            this._dtRedirections.Columns.Add("SortOrder", typeof(int));
-            this._dtRedirections.Columns.Add("SourceTabId", typeof(int));
-            this._dtRedirections.Columns.Add("IncludeChildTabs", typeof(bool));
-            this._dtRedirections.Columns.Add("TargetType", typeof(int));
-            this._dtRedirections.Columns.Add("TargetValue", typeof(object));
-            this._dtRedirections.Columns.Add("Enabled", typeof(bool));
-
-            this._dtRedirections.PrimaryKey = new[] { pkCol };
-
-            this._dtRules = new DataTable("Rules");
-            var pkCol1 = this._dtRules.Columns.Add("Id", typeof(int));
-            this._dtRules.Columns.Add("RedirectionId", typeof(int));
-            this._dtRules.Columns.Add("Capability", typeof(string));
-            this._dtRules.Columns.Add("Expression", typeof(string));
-
-            this._dtRules.PrimaryKey = new[] { pkCol1 };
-
-            this._dataProvider.Setup(d =>
-                                d.SaveRedirection(
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<string>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<bool>(),
-                                    It.IsAny<int>(),
-                                    It.IsAny<object>(),
-                                    It.IsAny<bool>(),
-                                    It.IsAny<int>())).Returns<int, int, string, int, int, int, bool, int, object, bool, int>(
-                                                            (id, portalId, name, type, sortOrder, sourceTabId, includeChildTabs, targetType, targetValue, enabled, userId) =>
-                                                            {
-                                                                if (id == -1)
-                                                                {
-                                                                    if (this._dtRedirections.Rows.Count == 0)
-                                                                    {
-                                                                        id = 1;
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        id = Convert.ToInt32(this._dtRedirections.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
-                                                                    }
-
-                                                                    var row = this._dtRedirections.NewRow();
-                                                                    row["Id"] = id;
-                                                                    row["PortalId"] = portalId;
-                                                                    row["name"] = name;
-                                                                    row["type"] = type;
-                                                                    row["sortOrder"] = sortOrder;
-                                                                    row["sourceTabId"] = sourceTabId;
-                                                                    row["includeChildTabs"] = includeChildTabs;
-                                                                    row["targetType"] = targetType;
-                                                                    row["targetValue"] = targetValue;
-                                                                    row["enabled"] = enabled;
-
-                                                                    this._dtRedirections.Rows.Add(row);
-                                                                }
-                                                                else
-                                                                {
-                                                                    var rows = this._dtRedirections.Select("Id = " + id);
-                                                                    if (rows.Length == 1)
-                                                                    {
-                                                                        var row = rows[0];
-
-                                                                        row["name"] = name;
-                                                                        row["type"] = type;
-                                                                        row["sortOrder"] = sortOrder;
-                                                                        row["sourceTabId"] = sourceTabId;
-                                                                        row["includeChildTabs"] = includeChildTabs;
-                                                                        row["targetType"] = targetType;
-                                                                        row["targetValue"] = targetValue;
-                                                                        row["enabled"] = enabled;
-                                                                    }
-                                                                }
-
-                                                                return id;
-                                                            });
-
-            this._dataProvider.Setup(d => d.GetRedirections(It.IsAny<int>())).Returns<int>(this.GetRedirectionsCallBack);
-            this._dataProvider.Setup(d => d.DeleteRedirection(It.IsAny<int>())).Callback<int>((id) =>
-            {
-                var rows = this._dtRedirections.Select("Id = " + id);
-                if (rows.Length == 1)
-                {
-                    this._dtRedirections.Rows.Remove(rows[0]);
-                }
-            });
-
-            this._dataProvider.Setup(d => d.SaveRedirectionRule(
-                It.IsAny<int>(),
-                It.IsAny<int>(),
-                It.IsAny<string>(),
-                It.IsAny<string>())).Callback<int, int, string, string>((id, rid, capbility, expression) =>
-                {
-                    if (id == -1)
-                    {
-                        if (this._dtRules.Rows.Count == 0)
-                        {
-                            id = 1;
-                        }
-                        else
-                        {
-                            id = Convert.ToInt32(this._dtRules.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
-                        }
-
-                        var row = this._dtRules.NewRow();
-                        row["Id"] = id;
-                        row["RedirectionId"] = rid;
-                        row["capability"] = capbility;
-                        row["expression"] = expression;
-
-                        this._dtRules.Rows.Add(row);
-                    }
-                    else
-                    {
-                        var rows = this._dtRules.Select("Id = " + id);
-                        if (rows.Length == 1)
-                        {
-                            var row = rows[0];
-
-                            row["capability"] = capbility;
-                            row["expression"] = expression;
-                        }
-                    }
-                });
-
-            this._dataProvider.Setup(d => d.GetRedirectionRules(It.IsAny<int>())).Returns<int>(this.GetRedirectionRulesCallBack);
-            this._dataProvider.Setup(d => d.DeleteRedirectionRule(It.IsAny<int>())).Callback<int>((id) =>
-            {
-                var rows = this._dtRules.Select("Id = " + id);
-                if (rows.Length == 1)
-                {
-                    this._dtRules.Rows.Remove(rows[0]);
-                }
-            });
-
-            this._dataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
-            this._dataProvider.Setup(d => d.GetTabs(It.IsAny<int>())).Returns<int>(this.GetTabsCallBack);
-            this._dataProvider.Setup(d => d.GetTab(It.IsAny<int>())).Returns<int>(this.GetTabCallBack);
-            this._dataProvider.Setup(d => d.GetTabModules(It.IsAny<int>())).Returns<int>(this.GetTabModulesCallBack);
-            this._dataProvider.Setup(d => d.GetPortalSettings(It.IsAny<int>(), It.IsAny<string>())).Returns<int, string>(this.GetPortalSettingsCallBack);
-            this._dataProvider.Setup(d => d.GetAllRedirections()).Returns(this.GetAllRedirectionsCallBack);
-
-            var portalDataService = MockComponentProvider.CreateNew<DotNetNuke.Entities.Portals.Data.IDataService>();
-            portalDataService.Setup(p => p.GetPortalGroups()).Returns(this.GetPortalGroupsCallBack);
-        }
-
-        private void SetupClientCapabilityProvider()
-        {
-            this._clientCapabilityProvider.Setup(p => p.GetClientCapability(It.IsAny<string>())).Returns<string>(this.GetClientCapabilityCallBack);
-        }
-
-        private void SetupRoleProvider()
-        {
-            var mockRoleProvider = MockComponentProvider.CreateNew<RoleProvider>();
-        }
-
-        private IDataReader GetRedirectionsCallBack(int portalId)
-        {
-            var dtCheck = this._dtRedirections.Clone();
-            foreach (var row in this._dtRedirections.Select("PortalId = " + portalId))
-            {
-                dtCheck.Rows.Add(row.ItemArray);
-            }
-
-            return dtCheck.CreateDataReader();
-        }
-
-        private IDataReader GetRedirectionRulesCallBack(int rid)
-        {
-            var dtCheck = this._dtRules.Clone();
-            foreach (var row in this._dtRules.Select("RedirectionId = " + rid))
-            {
-                dtCheck.Rows.Add(row.ItemArray);
-            }
-
-            return dtCheck.CreateDataReader();
-        }
-
-        private IDataReader GetPortalsCallBack(string culture)
-        {
-            return this.GetPortalCallBack(Portal0, DotNetNuke.Services.Localization.Localization.SystemLocale);
-        }
-
-        private IDataReader GetPortalCallBack(int portalId, string culture)
-        {
-            DataTable table = new DataTable("Portal");
-
-            var cols = new string[]
-                        {
-                            "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
-                            "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
-                            "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
-                            "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            int homePage = 55;
-            if (portalId == Portal0)
-            {
-                homePage = HomePageOnPortal0;
-            }
-            else if (portalId == Portal1)
-            {
-                homePage = HomePageOnPortal1;
-            }
-
-            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null, "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null, "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0", null, homePage.ToString(), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
-
-            return table.CreateDataReader();
-        }
-
-        private DataTable GetTabsDataTable()
-        {
-            DataTable table = new DataTable("Tabs");
-
-            var cols = new string[]
-                        {
-                            "TabID", "UniqueId", "VersionGuid", "DefaultLanguageGuid", "LocalizedVersionGuid", "TabOrder", "PortalID", "TabName", "IsVisible", "ParentId", "Level", "IconFile", "IconFileLarge", "DisableLink", "Title", "Description", "KeyWords", "IsDeleted", "SkinSrc", "ContainerSrc", "TabPath", "StartDate", "EndDate", "Url", "HasChildren", "RefreshInterval", "PageHeadText", "IsSecure", "PermanentRedirect", "SiteMapPriority", "ContentItemID", "Content", "ContentTypeID", "ModuleID", "ContentKey", "Indexed", "CultureCode", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "StateID", "HasBeenPublished", "IsSystem",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            table.Rows.Add(HomePageOnPortal1, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "3", Portal1, "HomePageOnPortal1", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//HomePageOnPortal1", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal1", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(HomePageOnPortal0, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "3", Portal0, "HomePageOnPortal0", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//HomePageOnPortal0", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(AnotherPageOnSamePortal, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "4", Portal0, "AnotherPageOnSamePortal", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//AnotherPageOnSamePortal", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(MobileLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "5", Portal0, "MobileLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//MobileLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(TabletLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "6", Portal0, "TabletLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//TabletLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(AllMobileLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "7", Portal0, "AllMobileLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//AllMobileLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-            table.Rows.Add(DeletedPageOnSamePortal, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "8", Portal0, "A Deleted Page", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, true, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//DeletedPage", null, null, string.Empty, false, null, null, false, false, "0.5", "90", "Deleted Page", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
-
-            return table;
-        }
-
-        private IDataReader GetTabsCallBack(int portalId)
-        {
-            var table = this.GetTabsDataTable();
-            var newTable = table.Clone();
-            foreach (var row in table.Select("PortalID = " + portalId))
-            {
-                newTable.Rows.Add(row.ItemArray);
-            }
-
-            return newTable.CreateDataReader();
-        }
-
-        private IDataReader GetTabCallBack(int tabId)
-        {
-            var table = this.GetTabsDataTable();
-            var newTable = table.Clone();
-            foreach (var row in table.Select("TabID = " + tabId))
-            {
-                newTable.Rows.Add(row.ItemArray);
-            }
-
-            return newTable.CreateDataReader();
-        }
-
-        private IDataReader GetTabModulesCallBack(int tabId)
-        {
-            DataTable table = new DataTable("TabModules");
-
-            var cols = new string[]
-                        {
-                            "PortalID", "TabID", "TabModuleID", "ModuleID", "ModuleDefID", "ModuleOrder", "PaneName", "ModuleTitle", "CacheTime", "CacheMethod", "Alignment", "Color", "Border", "IconFile", "AllTabs", "Visibility", "IsDeleted", "Header", "Footer", "StartDate", "EndDate", "ContainerSrc", "DisplayTitle", "DisplayPrint", "DisplaySyndicate", "IsWebSlice", "WebSliceTitle", "WebSliceExpiryDate", "WebSliceTTL", "InheritViewPermissions", "DesktopModuleID", "DefaultCacheTime", "ModuleControlID", "BusinessControllerClass", "IsAdmin", "SupportedFeatures", "ContentItemID", "Content", "ContentTypeID", "ContentKey", "Indexed", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "LastContentModifiedOnDate", "UniqueId", "VersionGuid", "DefaultLanguageGuid", "LocalizedVersionGuid", "CultureCode",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            table.Columns["ModuleID"].DataType = typeof(int);
-
-            var portalId = tabId == HomePageOnPortal0 ? Portal0 : Portal1;
-
-            table.Rows.Add(portalId, tabId, 51, 362, 117, 1, "ContentPane", "DotNetNuke® Enterprise Edition", "3600", "FileModuleCachingProvider", "left", null, null, null, false, "2", false, null, null, null, null, "[G]Containers/DarkKnight/Banner.ascx", true, false, false, false, null, null, "0", true, "75", "1200", "240", "DotNetNuke.Modules.HtmlPro.HtmlTextController", false, "7", "90", "DotNetNuke® Enterprise Edition", "2", null, false, "-1", DateTime.Now, "-1", DateTime.Now, DateTime.Now, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), null);
-
-            return table.CreateDataReader();
-        }
-
-        private IDataReader GetPortalSettingsCallBack(int portalId, string culture)
-        {
-            DataTable table = new DataTable("PortalSettings");
-
-            var cols = new string[]
-                        {
-                            "SettingName", "SettingValue", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            var alias = portalId == Portal0 ? PortalAlias0 : PortalAlias1;
-
-            table.Rows.Add("DefaultPortalAlias", alias, "-1", DateTime.Now, "-1", DateTime.Now, "en-us");
-
-            return table.CreateDataReader();
-        }
-
-        private IDataReader GetPortalGroupsCallBack()
-        {
-            DataTable table = new DataTable("PortalGroups");
-
-            var cols = new string[]
-                        {
-                            "PortalGroupID", "MasterPortalID", "PortalGroupName", "PortalGroupDescription", "AuthenticationDomain", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate",
-                        };
-
-            foreach (var col in cols)
-            {
-                table.Columns.Add(col);
-            }
-
-            table.Rows.Add(1, 0, "Portal Group", string.Empty, string.Empty, -1, DateTime.Now, -1, DateTime.Now);
-
-            return table.CreateDataReader();
-        }
-
-        private IClientCapability GetClientCapabilityCallBack(string userAgent)
-        {
-            IClientCapability clientCapability = new TestClientCapability();
-            if (userAgent == iphoneUserAgent)
-            {
-                clientCapability.IsMobile = true;
-                clientCapability.Capabilities.Add("mobile_browser", "Safari");
-                clientCapability.Capabilities.Add("device_os", "iPhone OS");
-            }
-            else if (userAgent == iPadTabletUserAgent)
-            {
-                clientCapability.IsTablet = true;
-                clientCapability.Capabilities.Add("mobile_browser", "Safari");
-                clientCapability.Capabilities.Add("device_os", "iPhone OS");
-            }
-            else if (userAgent == motorolaRIZRSymbianOSOpera865)
-            {
-                clientCapability.IsMobile = true;
-                clientCapability.Capabilities.Add("mobile_browser", "Opera Mini");
-                clientCapability.Capabilities.Add("device_os", "Symbian OS");
-            }
-
-            return clientCapability;
-        }
-
-        private IDataReader GetAllRedirectionsCallBack()
-        {
-            return this._dtRedirections.CreateDataReader();
-        }
-
-        private void PrepareData()
-        {
-            // id, portalId, name, type, sortOrder, sourceTabId, includeChildTabs, targetType, targetValue, enabled
-            this._dtRedirections.Rows.Add(1, Portal0, "R4", (int)RedirectionType.Other, 4, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
-            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
-            this._dtRedirections.Rows.Add(3, Portal0, "R3", (int)RedirectionType.AllMobile, 3, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
-            this._dtRedirections.Rows.Add(4, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
-            this._dtRedirections.Rows.Add(5, Portal0, "R5", (int)RedirectionType.MobilePhone, 5, HomePageOnPortal0, EnabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
-            this._dtRedirections.Rows.Add(6, Portal0, "R6", (int)RedirectionType.MobilePhone, 6, -1, DisabledFlag, (int)TargetType.Tab, HomePageOnPortal0, EnabledFlag);
-            this._dtRedirections.Rows.Add(7, Portal0, "R7", (int)RedirectionType.MobilePhone, 7, -1, DisabledFlag, (int)TargetType.Url, ExternalSite, EnabledFlag);
-
-            // id, redirectionId, capability, expression
-            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Safari");
-            this._dtRules.Rows.Add(2, 1, "device_os_version", "4.0");
-
-            this._dtRedirections.Rows.Add(8, Portal1, "R8", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
-            this._dtRedirections.Rows.Add(9, Portal1, "R9", (int)RedirectionType.Tablet, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
-            this._dtRedirections.Rows.Add(10, Portal1, "R10", (int)RedirectionType.AllMobile, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
-        }
-
-        private void PrepareOperaBrowserOnSymbianOSRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Other, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
-
-            // id, redirectionId, capability, expression
-            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Opera Mini");
-            this._dtRules.Rows.Add(2, 1, "device_os", "Symbian OS");
-        }
-
-        private void PrepareOperaBrowserOnIPhoneOSRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Other, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
-
-            // id, redirectionId, capability, expression
-            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Opera Mini");
-            this._dtRules.Rows.Add(2, 1, "device_os", "iPhone OS");
-        }
-
-        private void PreparePortalToAnotherPageOnSamePortal()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
-        }
-
-        private void PrepareSamePortalToSamePortalRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Portal, Portal0, 1);
-        }
-
-        private void PrepareExternalSiteRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 7, -1, DisabledFlag, (int)TargetType.Url, ExternalSite, 1);
-        }
-
-        private void PrepareMobileAndTabletRedirectionRuleWithMobileFirst()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Tab, MobileLandingPage, EnabledFlag);
-            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, -1, DisabledFlag, (int)TargetType.Tab, TabletLandingPage, EnabledFlag);
-        }
-
-        private void PrepareMobileAndTabletRedirectionRuleWithAndTabletRedirectionRuleTabletFirst()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Tablet, 1, -1, DisabledFlag, (int)TargetType.Tab, TabletLandingPage, EnabledFlag);
-            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.MobilePhone, 2, -1, DisabledFlag, (int)TargetType.Tab, MobileLandingPage, EnabledFlag);
-        }
-
-        private void PrepareAllMobileRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.AllMobile, 1, -1, DisabledFlag, (int)TargetType.Tab, AllMobileLandingPage, EnabledFlag);
-        }
-
-        private void PrepareSingleDisabledRedirectionRule()
-        {
-            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.AllMobile, 1, -1, DisabledFlag, (int)TargetType.Tab, AllMobileLandingPage, DisabledFlag);
-        }
-
-        private HttpApplication GenerateApplication()
-        {
-            var simulator = new Instance.Utilities.HttpSimulator.HttpSimulator("/", "c:\\");
-            simulator.SimulateRequest(new Uri("http://localhost/dnn/Default.aspx"));
-
-            var app = new HttpApplication();
-
-            var requestProp = typeof(NameValueCollection).GetProperty("IsReadOnly", BindingFlags.Instance | BindingFlags.NonPublic);
-            requestProp.SetValue(HttpContext.Current.Request.QueryString, false, null);
-
-            var stateProp = typeof(HttpApplication).GetField("_context", BindingFlags.Instance | BindingFlags.NonPublic);
-            stateProp.SetValue(app, HttpContext.Current);
-
-            return app;
-        }
-
-        private string NavigateUrl(int tabId)
-        {
-            return string.Format("/Default.aspx?tabid={0}", tabId);
-        }
-    }
-}
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        private void SetupDataProvider()
+        {
+            this._dataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+
+            this._dtRedirections = new DataTable("Redirections");
+            var pkCol = this._dtRedirections.Columns.Add("Id", typeof(int));
+            this._dtRedirections.Columns.Add("PortalId", typeof(int));
+            this._dtRedirections.Columns.Add("Name", typeof(string));
+            this._dtRedirections.Columns.Add("Type", typeof(int));
+            this._dtRedirections.Columns.Add("SortOrder", typeof(int));
+            this._dtRedirections.Columns.Add("SourceTabId", typeof(int));
+            this._dtRedirections.Columns.Add("IncludeChildTabs", typeof(bool));
+            this._dtRedirections.Columns.Add("TargetType", typeof(int));
+            this._dtRedirections.Columns.Add("TargetValue", typeof(object));
+            this._dtRedirections.Columns.Add("Enabled", typeof(bool));
+
+            this._dtRedirections.PrimaryKey = new[] { pkCol };
+
+            this._dtRules = new DataTable("Rules");
+            var pkCol1 = this._dtRules.Columns.Add("Id", typeof(int));
+            this._dtRules.Columns.Add("RedirectionId", typeof(int));
+            this._dtRules.Columns.Add("Capability", typeof(string));
+            this._dtRules.Columns.Add("Expression", typeof(string));
+
+            this._dtRules.PrimaryKey = new[] { pkCol1 };
+
+            this._dataProvider.Setup(d =>
+                                d.SaveRedirection(
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<string>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<bool>(),
+                                    It.IsAny<int>(),
+                                    It.IsAny<object>(),
+                                    It.IsAny<bool>(),
+                                    It.IsAny<int>())).Returns<int, int, string, int, int, int, bool, int, object, bool, int>(
+                                                            (id, portalId, name, type, sortOrder, sourceTabId, includeChildTabs, targetType, targetValue, enabled, userId) =>
+                                                            {
+                                                                if (id == -1)
+                                                                {
+                                                                    if (this._dtRedirections.Rows.Count == 0)
+                                                                    {
+                                                                        id = 1;
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        id = Convert.ToInt32(this._dtRedirections.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
+                                                                    }
+
+                                                                    var row = this._dtRedirections.NewRow();
+                                                                    row["Id"] = id;
+                                                                    row["PortalId"] = portalId;
+                                                                    row["name"] = name;
+                                                                    row["type"] = type;
+                                                                    row["sortOrder"] = sortOrder;
+                                                                    row["sourceTabId"] = sourceTabId;
+                                                                    row["includeChildTabs"] = includeChildTabs;
+                                                                    row["targetType"] = targetType;
+                                                                    row["targetValue"] = targetValue;
+                                                                    row["enabled"] = enabled;
+
+                                                                    this._dtRedirections.Rows.Add(row);
+                                                                }
+                                                                else
+                                                                {
+                                                                    var rows = this._dtRedirections.Select("Id = " + id);
+                                                                    if (rows.Length == 1)
+                                                                    {
+                                                                        var row = rows[0];
+
+                                                                        row["name"] = name;
+                                                                        row["type"] = type;
+                                                                        row["sortOrder"] = sortOrder;
+                                                                        row["sourceTabId"] = sourceTabId;
+                                                                        row["includeChildTabs"] = includeChildTabs;
+                                                                        row["targetType"] = targetType;
+                                                                        row["targetValue"] = targetValue;
+                                                                        row["enabled"] = enabled;
+                                                                    }
+                                                                }
+
+                                                                return id;
+                                                            });
+
+            this._dataProvider.Setup(d => d.GetRedirections(It.IsAny<int>())).Returns<int>(this.GetRedirectionsCallBack);
+            this._dataProvider.Setup(d => d.DeleteRedirection(It.IsAny<int>())).Callback<int>((id) =>
+            {
+                var rows = this._dtRedirections.Select("Id = " + id);
+                if (rows.Length == 1)
+                {
+                    this._dtRedirections.Rows.Remove(rows[0]);
+                }
+            });
+
+            this._dataProvider.Setup(d => d.SaveRedirectionRule(
+                It.IsAny<int>(),
+                It.IsAny<int>(),
+                It.IsAny<string>(),
+                It.IsAny<string>())).Callback<int, int, string, string>((id, rid, capbility, expression) =>
+                {
+                    if (id == -1)
+                    {
+                        if (this._dtRules.Rows.Count == 0)
+                        {
+                            id = 1;
+                        }
+                        else
+                        {
+                            id = Convert.ToInt32(this._dtRules.Select(string.Empty, "Id Desc")[0]["Id"]) + 1;
+                        }
+
+                        var row = this._dtRules.NewRow();
+                        row["Id"] = id;
+                        row["RedirectionId"] = rid;
+                        row["capability"] = capbility;
+                        row["expression"] = expression;
+
+                        this._dtRules.Rows.Add(row);
+                    }
+                    else
+                    {
+                        var rows = this._dtRules.Select("Id = " + id);
+                        if (rows.Length == 1)
+                        {
+                            var row = rows[0];
+
+                            row["capability"] = capbility;
+                            row["expression"] = expression;
+                        }
+                    }
+                });
+
+            this._dataProvider.Setup(d => d.GetRedirectionRules(It.IsAny<int>())).Returns<int>(this.GetRedirectionRulesCallBack);
+            this._dataProvider.Setup(d => d.DeleteRedirectionRule(It.IsAny<int>())).Callback<int>((id) =>
+            {
+                var rows = this._dtRules.Select("Id = " + id);
+                if (rows.Length == 1)
+                {
+                    this._dtRules.Rows.Remove(rows[0]);
+                }
+            });
+
+            this._dataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
+            this._dataProvider.Setup(d => d.GetTabs(It.IsAny<int>())).Returns<int>(this.GetTabsCallBack);
+            this._dataProvider.Setup(d => d.GetTab(It.IsAny<int>())).Returns<int>(this.GetTabCallBack);
+            this._dataProvider.Setup(d => d.GetTabModules(It.IsAny<int>())).Returns<int>(this.GetTabModulesCallBack);
+            this._dataProvider.Setup(d => d.GetPortalSettings(It.IsAny<int>(), It.IsAny<string>())).Returns<int, string>(this.GetPortalSettingsCallBack);
+            this._dataProvider.Setup(d => d.GetAllRedirections()).Returns(this.GetAllRedirectionsCallBack);
+
+            var portalDataService = MockComponentProvider.CreateNew<DotNetNuke.Entities.Portals.Data.IDataService>();
+            portalDataService.Setup(p => p.GetPortalGroups()).Returns(this.GetPortalGroupsCallBack);
+        }
+
+        private void SetupClientCapabilityProvider()
+        {
+            this._clientCapabilityProvider.Setup(p => p.GetClientCapability(It.IsAny<string>())).Returns<string>(this.GetClientCapabilityCallBack);
+        }
+
+        private void SetupRoleProvider()
+        {
+            var mockRoleProvider = MockComponentProvider.CreateNew<RoleProvider>();
+        }
+
+        private IDataReader GetRedirectionsCallBack(int portalId)
+        {
+            var dtCheck = this._dtRedirections.Clone();
+            foreach (var row in this._dtRedirections.Select("PortalId = " + portalId))
+            {
+                dtCheck.Rows.Add(row.ItemArray);
+            }
+
+            return dtCheck.CreateDataReader();
+        }
+
+        private IDataReader GetRedirectionRulesCallBack(int rid)
+        {
+            var dtCheck = this._dtRules.Clone();
+            foreach (var row in this._dtRules.Select("RedirectionId = " + rid))
+            {
+                dtCheck.Rows.Add(row.ItemArray);
+            }
+
+            return dtCheck.CreateDataReader();
+        }
+
+        private IDataReader GetPortalsCallBack(string culture)
+        {
+            return this.GetPortalCallBack(Portal0, DotNetNuke.Services.Localization.Localization.SystemLocale);
+        }
+
+        private IDataReader GetPortalCallBack(int portalId, string culture)
+        {
+            DataTable table = new DataTable("Portal");
+
+            var cols = new string[]
+                        {
+                            "PortalID", "PortalGroupID", "PortalName", "LogoFile", "FooterText", "ExpiryDate", "UserRegistration", "BannerAdvertising", "AdministratorId", "Currency", "HostFee",
+                            "HostSpace", "PageQuota", "UserQuota", "AdministratorRoleId", "RegisteredRoleId", "Description", "KeyWords", "BackgroundFile", "GUID", "PaymentProcessor", "ProcessorUserId",
+                            "ProcessorPassword", "SiteLogHistory", "Email", "DefaultLanguage", "TimezoneOffset", "AdminTabId", "HomeDirectory", "SplashTabId", "HomeTabId", "LoginTabId", "RegisterTabId",
+                            "UserTabId", "SearchTabId", "Custom404TabId", "Custom500TabId", "TermsTabId", "PrivacyTabId", "SuperTabId", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            int homePage = 55;
+            if (portalId == Portal0)
+            {
+                homePage = HomePageOnPortal0;
+            }
+            else if (portalId == Portal1)
+            {
+                homePage = HomePageOnPortal1;
+            }
+
+            table.Rows.Add(portalId, null, "My Website", "Logo.png", "Copyright 2011 by DotNetNuke Corporation", null, "2", "0", "2", "USD", "0", "0", "0", "0", "0", "1", "My Website", "DotNetNuke, DNN, Content, Management, CMS", null, "1057AC7A-3C08-4849-A3A6-3D2AB4662020", null, null, null, "0", "admin@changeme.invalid", "en-US", "-8", "58", "Portals/0", null, homePage.ToString(), null, null, "57", "56", "-1", "-1", null, null, "7", "-1", "2011-08-25 07:34:11", "-1", "2011-08-25 07:34:29", culture);
+
+            return table.CreateDataReader();
+        }
+
+        private DataTable GetTabsDataTable()
+        {
+            DataTable table = new DataTable("Tabs");
+
+            var cols = new string[]
+                        {
+                            "TabID", "UniqueId", "VersionGuid", "DefaultLanguageGuid", "LocalizedVersionGuid", "TabOrder", "PortalID", "TabName", "IsVisible", "ParentId", "Level", "IconFile", "IconFileLarge", "DisableLink", "Title", "Description", "KeyWords", "IsDeleted", "SkinSrc", "ContainerSrc", "TabPath", "StartDate", "EndDate", "Url", "HasChildren", "RefreshInterval", "PageHeadText", "IsSecure", "PermanentRedirect", "SiteMapPriority", "ContentItemID", "Content", "ContentTypeID", "ModuleID", "ContentKey", "Indexed", "CultureCode", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "StateID", "HasBeenPublished", "IsSystem",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            table.Rows.Add(HomePageOnPortal1, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "3", Portal1, "HomePageOnPortal1", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//HomePageOnPortal1", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal1", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(HomePageOnPortal0, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "3", Portal0, "HomePageOnPortal0", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//HomePageOnPortal0", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(AnotherPageOnSamePortal, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "4", Portal0, "AnotherPageOnSamePortal", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//AnotherPageOnSamePortal", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(MobileLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "5", Portal0, "MobileLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//MobileLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(TabletLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "6", Portal0, "TabletLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//TabletLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(AllMobileLandingPage, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "7", Portal0, "AllMobileLandingPage", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, false, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//AllMobileLandingPage", null, null, string.Empty, false, null, null, false, false, "0.5", "89", "HomePageOnPortal0", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+            table.Rows.Add(DeletedPageOnSamePortal, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), "8", Portal0, "A Deleted Page", true, null, "0", null, null, false, string.Empty, string.Empty, string.Empty, true, "[G]Skins/DarkKnight/Home-Mega-Menu.ascx", "[G]Containers/DarkKnight/SubTitle_Grey.ascx", "//DeletedPage", null, null, string.Empty, false, null, null, false, false, "0.5", "90", "Deleted Page", "1", "-1", null, false, null, "-1", DateTime.Now, "-1", DateTime.Now, "0", true, false);
+
+            return table;
+        }
+
+        private IDataReader GetTabsCallBack(int portalId)
+        {
+            var table = this.GetTabsDataTable();
+            var newTable = table.Clone();
+            foreach (var row in table.Select("PortalID = " + portalId))
+            {
+                newTable.Rows.Add(row.ItemArray);
+            }
+
+            return newTable.CreateDataReader();
+        }
+
+        private IDataReader GetTabCallBack(int tabId)
+        {
+            var table = this.GetTabsDataTable();
+            var newTable = table.Clone();
+            foreach (var row in table.Select("TabID = " + tabId))
+            {
+                newTable.Rows.Add(row.ItemArray);
+            }
+
+            return newTable.CreateDataReader();
+        }
+
+        private IDataReader GetTabModulesCallBack(int tabId)
+        {
+            DataTable table = new DataTable("TabModules");
+
+            var cols = new string[]
+                        {
+                            "PortalID", "TabID", "TabModuleID", "ModuleID", "ModuleDefID", "ModuleOrder", "PaneName", "ModuleTitle", "CacheTime", "CacheMethod", "Alignment", "Color", "Border", "IconFile", "AllTabs", "Visibility", "IsDeleted", "Header", "Footer", "StartDate", "EndDate", "ContainerSrc", "DisplayTitle", "DisplayPrint", "DisplaySyndicate", "IsWebSlice", "WebSliceTitle", "WebSliceExpiryDate", "WebSliceTTL", "InheritViewPermissions", "DesktopModuleID", "DefaultCacheTime", "ModuleControlID", "BusinessControllerClass", "IsAdmin", "SupportedFeatures", "ContentItemID", "Content", "ContentTypeID", "ContentKey", "Indexed", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "LastContentModifiedOnDate", "UniqueId", "VersionGuid", "DefaultLanguageGuid", "LocalizedVersionGuid", "CultureCode",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            table.Columns["ModuleID"].DataType = typeof(int);
+
+            var portalId = tabId == HomePageOnPortal0 ? Portal0 : Portal1;
+
+            table.Rows.Add(portalId, tabId, 51, 362, 117, 1, "ContentPane", "DotNetNuke® Enterprise Edition", "3600", "FileModuleCachingProvider", "left", null, null, null, false, "2", false, null, null, null, null, "[G]Containers/DarkKnight/Banner.ascx", true, false, false, false, null, null, "0", true, "75", "1200", "240", "DotNetNuke.Modules.HtmlPro.HtmlTextController", false, "7", "90", "DotNetNuke® Enterprise Edition", "2", null, false, "-1", DateTime.Now, "-1", DateTime.Now, DateTime.Now, Guid.NewGuid(), Guid.NewGuid(), null, Guid.NewGuid(), null);
+
+            return table.CreateDataReader();
+        }
+
+        private IDataReader GetPortalSettingsCallBack(int portalId, string culture)
+        {
+            DataTable table = new DataTable("PortalSettings");
+
+            var cols = new string[]
+                        {
+                            "SettingName", "SettingValue", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate", "CultureCode",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            var alias = portalId == Portal0 ? PortalAlias0 : PortalAlias1;
+
+            table.Rows.Add("DefaultPortalAlias", alias, "-1", DateTime.Now, "-1", DateTime.Now, "en-us");
+
+            return table.CreateDataReader();
+        }
+
+        private IDataReader GetPortalGroupsCallBack()
+        {
+            DataTable table = new DataTable("PortalGroups");
+
+            var cols = new string[]
+                        {
+                            "PortalGroupID", "MasterPortalID", "PortalGroupName", "PortalGroupDescription", "AuthenticationDomain", "CreatedByUserID", "CreatedOnDate", "LastModifiedByUserID", "LastModifiedOnDate",
+                        };
+
+            foreach (var col in cols)
+            {
+                table.Columns.Add(col);
+            }
+
+            table.Rows.Add(1, 0, "Portal Group", string.Empty, string.Empty, -1, DateTime.Now, -1, DateTime.Now);
+
+            return table.CreateDataReader();
+        }
+
+        private IClientCapability GetClientCapabilityCallBack(string userAgent)
+        {
+            IClientCapability clientCapability = new TestClientCapability();
+            if (userAgent == iphoneUserAgent)
+            {
+                clientCapability.IsMobile = true;
+                clientCapability.Capabilities.Add("mobile_browser", "Safari");
+                clientCapability.Capabilities.Add("device_os", "iPhone OS");
+            }
+            else if (userAgent == iPadTabletUserAgent)
+            {
+                clientCapability.IsTablet = true;
+                clientCapability.Capabilities.Add("mobile_browser", "Safari");
+                clientCapability.Capabilities.Add("device_os", "iPhone OS");
+            }
+            else if (userAgent == motorolaRIZRSymbianOSOpera865)
+            {
+                clientCapability.IsMobile = true;
+                clientCapability.Capabilities.Add("mobile_browser", "Opera Mini");
+                clientCapability.Capabilities.Add("device_os", "Symbian OS");
+            }
+
+            return clientCapability;
+        }
+
+        private IDataReader GetAllRedirectionsCallBack()
+        {
+            return this._dtRedirections.CreateDataReader();
+        }
+
+        private void PrepareData()
+        {
+            // id, portalId, name, type, sortOrder, sourceTabId, includeChildTabs, targetType, targetValue, enabled
+            this._dtRedirections.Rows.Add(1, Portal0, "R4", (int)RedirectionType.Other, 4, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
+            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
+            this._dtRedirections.Rows.Add(3, Portal0, "R3", (int)RedirectionType.AllMobile, 3, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
+            this._dtRedirections.Rows.Add(4, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
+            this._dtRedirections.Rows.Add(5, Portal0, "R5", (int)RedirectionType.MobilePhone, 5, HomePageOnPortal0, EnabledFlag, (int)TargetType.Portal, "1", EnabledFlag);
+            this._dtRedirections.Rows.Add(6, Portal0, "R6", (int)RedirectionType.MobilePhone, 6, -1, DisabledFlag, (int)TargetType.Tab, HomePageOnPortal0, EnabledFlag);
+            this._dtRedirections.Rows.Add(7, Portal0, "R7", (int)RedirectionType.MobilePhone, 7, -1, DisabledFlag, (int)TargetType.Url, ExternalSite, EnabledFlag);
+
+            // id, redirectionId, capability, expression
+            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Safari");
+            this._dtRules.Rows.Add(2, 1, "device_os_version", "4.0");
+
+            this._dtRedirections.Rows.Add(8, Portal1, "R8", (int)RedirectionType.MobilePhone, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
+            this._dtRedirections.Rows.Add(9, Portal1, "R9", (int)RedirectionType.Tablet, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
+            this._dtRedirections.Rows.Add(10, Portal1, "R10", (int)RedirectionType.AllMobile, 1, -1, EnabledFlag, (int)TargetType.Portal, 2, true);
+        }
+
+        private void PrepareOperaBrowserOnSymbianOSRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Other, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
+
+            // id, redirectionId, capability, expression
+            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Opera Mini");
+            this._dtRules.Rows.Add(2, 1, "device_os", "Symbian OS");
+        }
+
+        private void PrepareOperaBrowserOnIPhoneOSRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Other, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
+
+            // id, redirectionId, capability, expression
+            this._dtRules.Rows.Add(1, 1, "mobile_browser", "Opera Mini");
+            this._dtRules.Rows.Add(2, 1, "device_os", "iPhone OS");
+        }
+
+        private void PreparePortalToAnotherPageOnSamePortal()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Tab, AnotherPageOnSamePortal, EnabledFlag);
+        }
+
+        private void PrepareSamePortalToSamePortalRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Portal, Portal0, 1);
+        }
+
+        private void PrepareExternalSiteRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 7, -1, DisabledFlag, (int)TargetType.Url, ExternalSite, 1);
+        }
+
+        private void PrepareMobileAndTabletRedirectionRuleWithMobileFirst()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.MobilePhone, 1, -1, DisabledFlag, (int)TargetType.Tab, MobileLandingPage, EnabledFlag);
+            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.Tablet, 2, -1, DisabledFlag, (int)TargetType.Tab, TabletLandingPage, EnabledFlag);
+        }
+
+        private void PrepareMobileAndTabletRedirectionRuleWithAndTabletRedirectionRuleTabletFirst()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.Tablet, 1, -1, DisabledFlag, (int)TargetType.Tab, TabletLandingPage, EnabledFlag);
+            this._dtRedirections.Rows.Add(2, Portal0, "R2", (int)RedirectionType.MobilePhone, 2, -1, DisabledFlag, (int)TargetType.Tab, MobileLandingPage, EnabledFlag);
+        }
+
+        private void PrepareAllMobileRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.AllMobile, 1, -1, DisabledFlag, (int)TargetType.Tab, AllMobileLandingPage, EnabledFlag);
+        }
+
+        private void PrepareSingleDisabledRedirectionRule()
+        {
+            this._dtRedirections.Rows.Add(1, Portal0, "R1", (int)RedirectionType.AllMobile, 1, -1, DisabledFlag, (int)TargetType.Tab, AllMobileLandingPage, DisabledFlag);
+        }
+
+        private HttpApplication GenerateApplication()
+        {
+            var simulator = new Instance.Utilities.HttpSimulator.HttpSimulator("/", "c:\\");
+            simulator.SimulateRequest(new Uri("http://localhost/dnn/Default.aspx"));
+
+            var app = new HttpApplication();
+
+            var requestProp = typeof(NameValueCollection).GetProperty("IsReadOnly", BindingFlags.Instance | BindingFlags.NonPublic);
+            requestProp.SetValue(HttpContext.Current.Request.QueryString, false, null);
+
+            var stateProp = typeof(HttpApplication).GetField("_context", BindingFlags.Instance | BindingFlags.NonPublic);
+            stateProp.SetValue(app, HttpContext.Current);
+
+            return app;
+        }
+
+        private string NavigateUrl(int tabId)
+        {
+            return string.Format("/Default.aspx?tabid={0}", tabId);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Tokens/TokenReplaceTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Tokens/TokenReplaceTests.cs
index 6182dd77dac..cc1049aeeb0 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Tokens/TokenReplaceTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/Tokens/TokenReplaceTests.cs	
@@ -1,121 +1,134 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
-namespace DotNetNuke.Tests.Core.Services.Tokens
-{
+namespace DotNetNuke.Tests.Core.Services.Tokens
+{
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
     using DotNetNuke.ComponentModel;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Modules;
-    using DotNetNuke.Entities.Modules.Actions;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Entities.Tabs;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Services.Cache;
-    using DotNetNuke.Services.Tokens;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Modules;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Entities.Tabs;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Services.Cache;
+    using DotNetNuke.Services.Tokens;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
     using NUnit.Framework;
 
-    [TestFixture]
-    public class TokenReplaceTests
-    {
-        private Mock<CachingProvider> _mockCache;
-        private Mock<IPortalController> _portalController;
-        private Mock<IModuleController> _moduleController;
-        private Mock<IUserController> _userController;
-        private Mock<IHostController> _mockHostController;
-
-        [SetUp]
-        public void SetUp()
-        {
-            ComponentFactory.RegisterComponentInstance<TokenProvider>(new CoreTokenProvider());
-            this._mockCache = MockComponentProvider.CreateDataCacheProvider();
-            this._mockHostController = new Mock<IHostController>();
-            this._portalController = new Mock<IPortalController>();
-            this._moduleController = new Mock<IModuleController>();
-            this._userController = new Mock<IUserController>();
-            PortalController.SetTestableInstance(this._portalController.Object);
-            ModuleController.SetTestableInstance(this._moduleController.Object);
-            UserController.SetTestableInstance(this._userController.Object);
-            HostController.RegisterInstance(this._mockHostController.Object);
-            this.SetupPortalSettings();
-            this.SetupModuleInfo();
-            this.SetupUserInfo();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            PortalController.ClearInstance();
-            ModuleController.ClearInstance();
-            UserController.ClearInstance();
-        }
-
-        [Test]
-        [TestCase("var myArray = [{ foo: 'bar' }]")]
-        [TestCase("This is just plain text")]
-        public void TextInputIsReturnedUnModified(string sourceText)
-        {
-            // Arrange
-            var tokenReplace = new TokenReplace(Scope.DefaultSettings, PortalSettings.Current.DefaultLanguage,
-                PortalSettings.Current, UserController.Instance.GetUser(1, 1), 1);
-
-            // Act
-            var outputText = tokenReplace.ReplaceEnvironmentTokens(sourceText);
-
-            // Assert
-            Assert.AreEqual(outputText, sourceText);
-        }
-
-        [Test]
-        [TestCase("[Resx:{key:\"Email\"}]")]
-        [TestCase("[Css: { path: \"~/DesktopModules/Dnn/ContactList/stylesheets/bootstrap.min.css\"}]")]
-        [TestCase("[JavaScript:{ jsname: \"Knockout\" }] [JavaScript:{ path: \"~/DesktopModules/Dnn/ContactList/ClientScripts/contacts.js\"}]")]
-        public void ObjectInputIsReturnedBlank(string sourceText)
-        {
-            // Arrange
-            var tokenReplace = new TokenReplace(Scope.DefaultSettings, PortalSettings.Current.DefaultLanguage,
-                PortalSettings.Current, UserController.Instance.GetUser(1, 1), 1);
-
-            // Act
-            var outputText = tokenReplace.ReplaceEnvironmentTokens(sourceText);
-
-            // Assert
-            Assert.AreEqual(outputText.Trim(), string.Empty);
-        }
-
-        private void SetupPortalSettings()
-        {
-            var portalSettings = new PortalSettings
-            {
-                AdministratorRoleName = Utilities.Constants.RoleName_Administrators,
-                ActiveTab = new TabInfo { ModuleID = 1, TabID = 1 },
-            };
-
-            this._portalController.Setup(pc => pc.GetCurrentPortalSettings()).Returns(portalSettings);
-        }
-
-        private void SetupModuleInfo()
-        {
-            var moduleInfo = new ModuleInfo
-            {
-                ModuleID = 1,
-                PortalID = this._portalController.Object.GetCurrentPortalSettings().PortalId,
-            };
-
-            this._moduleController.Setup(mc => mc.GetModule(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))
-                .Returns(moduleInfo);
-        }
-
-        private void SetupUserInfo()
-        {
-            var userInfo = new UserInfo
-            {
-                UserID = 1,
-                Username = "admin",
-                PortalID = this._portalController.Object.GetCurrentPortalSettings().PortalId,
-            };
-            this._userController.Setup(uc => uc.GetUser(It.IsAny<int>(), It.IsAny<int>())).Returns(userInfo);
-        }
-    }
-}
+    [TestFixture]
+    public class TokenReplaceTests
+    {
+        private Mock<CachingProvider> mockCache;
+        private Mock<IPortalController> portalController;
+        private Mock<IModuleController> moduleController;
+        private Mock<IUserController> userController;
+        private Mock<IHostController> mockHostController;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+
+            ComponentFactory.RegisterComponentInstance<TokenProvider>(new CoreTokenProvider());
+            this.mockCache = MockComponentProvider.CreateDataCacheProvider();
+            this.mockHostController = new Mock<IHostController>();
+            this.portalController = new Mock<IPortalController>();
+            this.moduleController = new Mock<IModuleController>();
+            this.userController = new Mock<IUserController>();
+            PortalController.SetTestableInstance(this.portalController.Object);
+            ModuleController.SetTestableInstance(this.moduleController.Object);
+            UserController.SetTestableInstance(this.userController.Object);
+            HostController.RegisterInstance(this.mockHostController.Object);
+            this.SetupPortalSettings();
+            this.SetupModuleInfo();
+            this.SetupUserInfo();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            PortalController.ClearInstance();
+            ModuleController.ClearInstance();
+            UserController.ClearInstance();
+        }
+
+        [Test]
+        [TestCase("var myArray = [{ foo: 'bar' }]")]
+        [TestCase("This is just plain text")]
+        public void TextInputIsReturnedUnModified(string sourceText)
+        {
+            // Arrange
+            var tokenReplace = new TokenReplace(Scope.DefaultSettings, PortalSettings.Current.DefaultLanguage,
+                PortalSettings.Current, UserController.Instance.GetUser(1, 1), 1);
+
+            // Act
+            var outputText = tokenReplace.ReplaceEnvironmentTokens(sourceText);
+
+            // Assert
+            Assert.AreEqual(outputText, sourceText);
+        }
+
+        [Test]
+        [TestCase("[Resx:{key:\"Email\"}]")]
+        [TestCase("[Css: { path: \"~/DesktopModules/Dnn/ContactList/stylesheets/bootstrap.min.css\"}]")]
+        [TestCase("[JavaScript:{ jsname: \"Knockout\" }] [JavaScript:{ path: \"~/DesktopModules/Dnn/ContactList/ClientScripts/contacts.js\"}]")]
+        public void ObjectInputIsReturnedBlank(string sourceText)
+        {
+            // Arrange
+            var tokenReplace = new TokenReplace(Scope.DefaultSettings, PortalSettings.Current.DefaultLanguage,
+                PortalSettings.Current, UserController.Instance.GetUser(1, 1), 1);
+
+            // Act
+            var outputText = tokenReplace.ReplaceEnvironmentTokens(sourceText);
+
+            // Assert
+            Assert.AreEqual(outputText.Trim(), string.Empty);
+        }
+
+        private void SetupPortalSettings()
+        {
+            var portalSettings = new PortalSettings
+            {
+                AdministratorRoleName = Utilities.Constants.RoleName_Administrators,
+                ActiveTab = new TabInfo { ModuleID = 1, TabID = 1 },
+            };
+
+            this.portalController.Setup(pc => pc.GetCurrentPortalSettings()).Returns(portalSettings);
+        }
+
+        private void SetupModuleInfo()
+        {
+            var moduleInfo = new ModuleInfo
+            {
+                ModuleID = 1,
+                PortalID = this.portalController.Object.GetCurrentPortalSettings().PortalId,
+            };
+
+            this.moduleController.Setup(mc => mc.GetModule(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))
+                .Returns(moduleInfo);
+        }
+
+        private void SetupUserInfo()
+        {
+            var userInfo = new UserInfo
+            {
+                UserID = 1,
+                Username = "admin",
+                PortalID = this.portalController.Object.GetCurrentPortalSettings().PortalId,
+            };
+            this.userController.Setup(uc => uc.GetUser(It.IsAny<int>(), It.IsAny<int>())).Returns(userInfo);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/UserRequest/UserRequestIPAddressControllerTest.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/UserRequest/UserRequestIPAddressControllerTest.cs
index 19260665959..5ef455fb891 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/UserRequest/UserRequestIPAddressControllerTest.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Services/UserRequest/UserRequestIPAddressControllerTest.cs	
@@ -2,128 +2,143 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Core.Services.UserRequest
-{
-    using System.Collections.Specialized;
-    using System.Web;
-
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Portals;
-    using DotNetNuke.Services.UserRequest;
-    using DotNetNuke.Tests.Utilities;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    internal class UserRequestIPAddressControllerTest
-    {
-        private Mock<IPortalController> _mockPortalController;
-        private Mock<IHostController> _mockHostController;
-        private Mock<HttpContextBase> _mockhttpContext;
-        private Mock<HttpRequestBase> _mockRequest;
-
-        private UserRequestIPAddressController _userRequestIPAddressController;
-
-        [SetUp]
-        public void Setup()
-        {
-            NameValueCollection serverVariables = new NameValueCollection();
-
-            // Setup Mock
-            this._mockhttpContext = HttpContextHelper.RegisterMockHttpContext();
-            this._mockRequest = Mock.Get(this._mockhttpContext.Object.Request);
-            this._mockRequest.Setup(x => x.ServerVariables).Returns(serverVariables);
-            this._mockHostController = MockComponentProvider.CreateNew<IHostController>();
-            this._mockPortalController = MockComponentProvider.CreateNew<IPortalController>();
-            PortalController.SetTestableInstance(this._mockPortalController.Object);
-
-            // System under test
-            this._userRequestIPAddressController = new UserRequestIPAddressController();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            MockComponentProvider.ResetContainer();
-        }
-
-        [TestCase("111.111.111.111", "X-Forwarded-For")]
-        [TestCase("111.111.111.111,123.112.11.33", "X-Forwarded-For")]
-        [TestCase("111.111.111.111", "X-ProxyUser-Ip")]
-        [TestCase("111.111.111.111,23.112.11.33", "X-ProxyUser-Ip")]
-        public void UserRequestIPAddress_ShouldReturnIP_IfAnyHeaderIsPresent(string requestIp, string headerName)
-        {
-            // Arrange
-            var expectedIp = "111.111.111.111";
-
-            NameValueCollection headersWithXForwardedHeaders = new NameValueCollection();
-            headersWithXForwardedHeaders.Add(headerName, requestIp);
-            this._mockHostController.Setup(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>())).Returns(headerName);
-            this._mockRequest.Setup(x => x.Headers).Returns(headersWithXForwardedHeaders);
-
-            // Act
-            string userRequestIPAddress = this._userRequestIPAddressController.GetUserRequestIPAddress(this._mockhttpContext.Object.Request);
-
-            // Assert
-            Assert.AreEqual(expectedIp, userRequestIPAddress);
-        }
-
-        [Test]
-        public void UserRequestIPAddress_ShouldReturnIP_IfRemoteAddrServerVariablePresent()
-        {
-            // Arrange
-            var expectedIp = "111.111.111.111";
-            var remoteVariable = "REMOTE_ADDR";
-            var requestIp = "111.111.111.111";
-
-            NameValueCollection serverVariables = new NameValueCollection();
-            serverVariables.Add(remoteVariable, requestIp);
-            this._mockRequest.Setup(x => x.ServerVariables).Returns(serverVariables);
-
-            // Act
-            var userRequestIPAddress = this._userRequestIPAddressController.GetUserRequestIPAddress(this._mockhttpContext.Object.Request);
-
-            // Assert
-            Assert.AreSame(expectedIp, userRequestIPAddress);
-            this._mockRequest.VerifyGet(r => r.ServerVariables);
-            this._mockRequest.VerifyGet(r => r.Headers);
-            this._mockHostController.Verify(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>()));
-        }
-
-        [Test]
-        public void UserRequestIPAddress_ShouldReturnIP_IfUserHostAddress()
-        {
-            // Arrange
-            var expectedIp = "111.111.111.111";
-            this._mockRequest.Setup(x => x.UserHostAddress).Returns(expectedIp);
-
-            // Act
-            var userRequestIPAddress = this._userRequestIPAddressController.GetUserRequestIPAddress(this._mockhttpContext.Object.Request);
-
-            // Assert
-            Assert.AreSame(expectedIp, userRequestIPAddress);
-            this._mockRequest.VerifyGet(r => r.UserHostAddress);
-        }
-
-        [TestCase("abc.111.eer")]
-        [TestCase("somedomain.com")]
-        [TestCase("244.275.111.111")]
-        public void UserRequestIPAddress_ShouldReturnEmptyString_IfIPAddressIsNotValid(string requestIp)
-        {
-            // Arrange
-            var headerName = "X-Forwarded-For";
-
-            NameValueCollection headersWithXForwardedHeaders = new NameValueCollection();
-            headersWithXForwardedHeaders.Add(headerName, requestIp);
-            this._mockRequest.Setup(x => x.Headers).Returns(headersWithXForwardedHeaders);
-            this._mockHostController.Setup(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>())).Returns(headerName);
-
-            // Act
-            var userRequestIPAddress = this._userRequestIPAddressController.GetUserRequestIPAddress(this._mockhttpContext.Object.Request);
-
-            // Assert
-            Assert.AreSame(string.Empty, userRequestIPAddress);
-        }
-    }
-}
+namespace DotNetNuke.Tests.Core.Services.UserRequest
+{
+    using System.Collections.Specialized;
+    using System.Web;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Services.UserRequest;
+    using DotNetNuke.Tests.Utilities;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    internal class UserRequestIPAddressControllerTest
+    {
+        private Mock<IPortalController> mockPortalController;
+        private Mock<IHostController> mockHostController;
+        private Mock<HttpContextBase> mockhttpContext;
+        private Mock<HttpRequestBase> mockRequest;
+
+        private UserRequestIPAddressController userRequestIPAddressController;
+
+        [SetUp]
+        public void Setup()
+        {
+            NameValueCollection serverVariables = new NameValueCollection();
+
+            // Setup Mock
+            this.mockhttpContext = HttpContextHelper.RegisterMockHttpContext();
+            this.mockRequest = Mock.Get(this.mockhttpContext.Object.Request);
+            this.mockRequest.Setup(x => x.ServerVariables).Returns(serverVariables);
+            this.mockHostController = new Mock<IHostController>();
+            this.mockHostController.As<IHostSettingsService>();
+            this.mockPortalController = MockComponentProvider.CreateNew<IPortalController>();
+            PortalController.SetTestableInstance(this.mockPortalController.Object);
+
+            // System under test
+            this.userRequestIPAddressController = new UserRequestIPAddressController();
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Globals.DependencyProvider = null;
+            MockComponentProvider.ResetContainer();
+        }
+
+        [TestCase("111.111.111.111", "X-Forwarded-For")]
+        [TestCase("111.111.111.111,123.112.11.33", "X-Forwarded-For")]
+        [TestCase("111.111.111.111", "X-ProxyUser-Ip")]
+        [TestCase("111.111.111.111,23.112.11.33", "X-ProxyUser-Ip")]
+        public void UserRequestIPAddress_ShouldReturnIP_IfAnyHeaderIsPresent(string requestIp, string headerName)
+        {
+            // Arrange
+            var expectedIp = "111.111.111.111";
+
+            NameValueCollection headersWithXForwardedHeaders = new NameValueCollection();
+            headersWithXForwardedHeaders.Add(headerName, requestIp);
+            this.mockHostController.Setup(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>())).Returns(headerName);
+            this.mockRequest.Setup(x => x.Headers).Returns(headersWithXForwardedHeaders);
+
+            // Act
+            string userRequestIPAddress = this.userRequestIPAddressController.GetUserRequestIPAddress(this.mockhttpContext.Object.Request);
+
+            // Assert
+            Assert.AreEqual(expectedIp, userRequestIPAddress);
+        }
+
+        [Test]
+        public void UserRequestIPAddress_ShouldReturnIP_IfRemoteAddrServerVariablePresent()
+        {
+            // Arrange
+            var expectedIp = "111.111.111.111";
+            var remoteVariable = "REMOTE_ADDR";
+            var requestIp = "111.111.111.111";
+
+            NameValueCollection serverVariables = new NameValueCollection();
+            serverVariables.Add(remoteVariable, requestIp);
+            this.mockRequest.Setup(x => x.ServerVariables).Returns(serverVariables);
+
+            // Act
+            var userRequestIPAddress = this.userRequestIPAddressController.GetUserRequestIPAddress(this.mockhttpContext.Object.Request);
+
+            // Assert
+            Assert.AreSame(expectedIp, userRequestIPAddress);
+            this.mockRequest.VerifyGet(r => r.ServerVariables);
+            this.mockRequest.VerifyGet(r => r.Headers);
+            this.mockHostController.Verify(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>()));
+        }
+
+        [Test]
+        public void UserRequestIPAddress_ShouldReturnIP_IfUserHostAddress()
+        {
+            // Arrange
+            var expectedIp = "111.111.111.111";
+            this.mockRequest.Setup(x => x.UserHostAddress).Returns(expectedIp);
+
+            // Act
+            var userRequestIPAddress = this.userRequestIPAddressController.GetUserRequestIPAddress(this.mockhttpContext.Object.Request);
+
+            // Assert
+            Assert.AreSame(expectedIp, userRequestIPAddress);
+            this.mockRequest.VerifyGet(r => r.UserHostAddress);
+        }
+
+        [TestCase("abc.111.eer")]
+        [TestCase("somedomain.com")]
+        [TestCase("244.275.111.111")]
+        public void UserRequestIPAddress_ShouldReturnEmptyString_IfIPAddressIsNotValid(string requestIp)
+        {
+            // Arrange
+            var headerName = "X-Forwarded-For";
+
+            NameValueCollection headersWithXForwardedHeaders = new NameValueCollection();
+            headersWithXForwardedHeaders.Add(headerName, requestIp);
+            this.mockRequest.Setup(x => x.Headers).Returns(headersWithXForwardedHeaders);
+            this.mockHostController.Setup(hc => hc.GetString(It.IsAny<string>(), It.IsAny<string>())).Returns(headerName);
+
+            // Act
+            var userRequestIPAddress = this.userRequestIPAddressController.GetUserRequestIPAddress(this.mockhttpContext.Object.Request);
+
+            // Assert
+            Assert.AreSame(string.Empty, userRequestIPAddress);
+        }
+    }
+}
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/PortalAliasRouteManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/PortalAliasRouteManagerTests.cs
index 15a2a50c38d..f31e5a6beb7 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/PortalAliasRouteManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/PortalAliasRouteManagerTests.cs	
@@ -11,6 +11,7 @@ namespace DotNetNuke.Tests.Web.Api
 
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Abstractions.Portals;
     using DotNetNuke.Common;
     using DotNetNuke.Common.Internal;
     using DotNetNuke.Entities.Portals;
@@ -24,27 +25,36 @@ namespace DotNetNuke.Tests.Web.Api
 
     [TestFixture]
     public class PortalAliasRouteManagerTests
-    {
+    {
+        private Mock<IPortalAliasService> mockPortalAliasService;
+
         [SetUp]
         public void SetUp()
         {
             var services = new ServiceCollection();
             var navigationManagerMock = new Mock<INavigationManager>();
+
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
 
+            this.mockPortalAliasService = new Mock<IPortalAliasService>();
+            this.mockPortalAliasService.As<IPortalAliasController>();
+
             services.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
             services.AddScoped(typeof(INavigationManager), (x) => navigationManagerMock.Object);
-            
+            services.AddScoped<IPortalAliasService>(_ => this.mockPortalAliasService.Object);
+
             Globals.DependencyProvider = services.BuildServiceProvider();
         }
 
         [TearDown]
         public void TearDown()
         {
-            Globals.DependencyProvider = null;
+            Globals.DependencyProvider = null;
+
+            this.mockPortalAliasService = null;
+
             PortalController.ClearInstance();
-            PortalAliasController.ClearInstance();
             TestableGlobals.ClearInstance();
         }
 
@@ -97,13 +107,15 @@ public void ParentPortalOnVirtualDirReturnsAnEmptyPrefix()
             var portals = new ArrayList { new PortalInfo { PortalID = 1 } };
             mockPortalController.Setup(x => x.GetPortals()).Returns(portals);
             PortalController.SetTestableInstance(mockPortalController.Object);
-
-            var mockPortalAliasController = new Mock<IPortalAliasController>();
-            mockPortalAliasController.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
                 {
                     new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir" }
                 });
-            PortalAliasController.SetTestableInstance(mockPortalAliasController.Object);
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+                {
+                    new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir" }
+                });
 
             var mockGlobals = new Mock<IGlobals>();
             mockGlobals.Setup(x => x.ApplicationPath).Returns("/vdir");
@@ -125,12 +137,14 @@ public void SingleParentPortalReturnsAnEmptyPrefix()
             mockPortalController.Setup(x => x.GetPortals()).Returns(portals);
             PortalController.SetTestableInstance(mockPortalController.Object);
 
-            var mockPortalAliasController = new Mock<IPortalAliasController>();
-            mockPortalAliasController.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+                {
+                    new PortalAliasInfo { HTTPAlias = "valid.lvh.me" }
+                });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
                 {
                     new PortalAliasInfo { HTTPAlias = "valid.lvh.me" }
                 });
-            PortalAliasController.SetTestableInstance(mockPortalAliasController.Object);
 
             var mockGlobals = new Mock<IGlobals>();
             mockGlobals.Setup(x => x.ApplicationPath).Returns(string.Empty);
@@ -151,10 +165,9 @@ public void PrefixCountsAreCached()
             var portals = new ArrayList { new PortalInfo { PortalID = 1 } };
             mockPortalController.Setup(x => x.GetPortals()).Returns(portals);
             PortalController.SetTestableInstance(mockPortalController.Object);
-
-            var mockPortalAliasController = new Mock<IPortalAliasController>();
-            mockPortalAliasController.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
-            PortalAliasController.SetTestableInstance(mockPortalAliasController.Object);
+
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
 
             var mockGlobals = new Mock<IGlobals>();
             mockGlobals.Setup(x => x.ApplicationPath).Returns(string.Empty);
@@ -178,9 +191,8 @@ public void PrefixCountsCacheCanBeCleared()
             mockPortalController.Setup(x => x.GetPortals()).Returns(portals);
             PortalController.SetTestableInstance(mockPortalController.Object);
 
-            var mockPortalAliasController = new Mock<IPortalAliasController>();
-            mockPortalAliasController.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
-            PortalAliasController.SetTestableInstance(mockPortalAliasController.Object);
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[] { new PortalAliasInfo { HTTPAlias = "valid.lvh.me" } });
 
             var mockGlobals = new Mock<IGlobals>();
             mockGlobals.Setup(x => x.ApplicationPath).Returns(string.Empty);
@@ -205,13 +217,17 @@ public void VirtralDirWithChildPortalHasABlankAndASinglePrefix()
             mockPortalController.Setup(x => x.GetPortals()).Returns(portals);
             PortalController.SetTestableInstance(mockPortalController.Object);
 
-            var mockPortalAliasController = new Mock<IPortalAliasController>();
-            mockPortalAliasController.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
+                {
+                    new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir" },
+                    new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir/child" },
+                });
+            this.mockPortalAliasService.As<IPortalAliasController>()
+                .Setup(x => x.GetPortalAliasesByPortalId(It.IsAny<int>())).Returns(new[]
                 {
                     new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir" },
                     new PortalAliasInfo { HTTPAlias = "valid.lvh.me/vdir/child" },
                 });
-            PortalAliasController.SetTestableInstance(mockPortalAliasController.Object);
 
             var mockGlobals = new Mock<IGlobals>();
             mockGlobals.Setup(x => x.ApplicationPath).Returns("/vdir");
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs
index a38296883e1..480c2bf1bde 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/Api/ServiceRoutingManagerTests.cs	
@@ -12,6 +12,7 @@ namespace DotNetNuke.Tests.Web.Api
 
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Abstractions.Portals;
     using DotNetNuke.Common;
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Framework.Internal.Reflection;
@@ -26,28 +27,37 @@ namespace DotNetNuke.Tests.Web.Api
     public class ServiceRoutingManagerTests
     {
         // ReSharper disable UnusedMember.Local
-        private readonly List<string[]> _emptyStringArrays = new List<string[]>
+        private readonly List<string[]> emptyStringArrays = new List<string[]>
                                                         { null, new string[0], new[] { string.Empty }, new string[] { null } };
 
         // ReSharper restore UnusedMember.Local
-        private Mock<IPortalController> _mockPortalController;
-        private IPortalController _portalController;
+        private Mock<IPortalController> mockPortalController;
+        private IPortalController portalController;
+
+        private Mock<IPortalAliasService> mockPortalAliasService;
 
         [SetUp]
         public void Setup()
         {
             FakeServiceRouteMapper.RegistrationCalls = 0;
 
-            this._mockPortalController = new Mock<IPortalController>();
-            this._portalController = this._mockPortalController.Object;
-            PortalController.SetTestableInstance(this._portalController);
+            this.mockPortalController = new Mock<IPortalController>();
+            this.portalController = this.mockPortalController.Object;
+            PortalController.SetTestableInstance(this.portalController);
 
             var services = new ServiceCollection();
             var navigationManagerMock = new Mock<INavigationManager>();
+
             var mockApplicationStatusInfo = new Mock<IApplicationStatusInfo>();
             mockApplicationStatusInfo.Setup(info => info.Status).Returns(UpgradeStatus.Install);
+
+            this.mockPortalAliasService = new Mock<IPortalAliasService>();
+            this.mockPortalAliasService.As<IPortalAliasController>();
+
             services.AddTransient<IApplicationStatusInfo>(container => mockApplicationStatusInfo.Object);
             services.AddScoped(typeof(INavigationManager), (x) => navigationManagerMock.Object);
+            services.AddScoped<IPortalAliasService>(_ => this.mockPortalAliasService.Object);
+
             Globals.DependencyProvider = services.BuildServiceProvider();
         }
 
@@ -62,6 +72,7 @@ public void TearDown()
             }
 
             Globals.DependencyProvider = null;
+            this.mockPortalAliasService = null;
         }
 
         [Test]
@@ -92,7 +103,7 @@ public void LocatesAllServiceRouteMappers()
         }
 
         [Test]
-        public void NameSpaceRequiredOnMapRouteCalls([ValueSource("_emptyStringArrays")] string[] namespaces)
+        public void NameSpaceRequiredOnMapRouteCalls([ValueSource("emptyStringArrays")] string[] namespaces)
         {
             var srm = new ServicesRoutingManager(new RouteCollection());
 
@@ -150,7 +161,7 @@ public void UniqueNameRequiredOnMapRouteCalls(string uniqueName)
         public void UrlCanStartWithSlash()
         {
             // Arrange
-            this._mockPortalController.Setup(x => x.GetPortals()).Returns(new ArrayList());
+            this.mockPortalController.Setup(x => x.GetPortals()).Returns(new ArrayList());
 
             // Act
             var srm = new ServicesRoutingManager(new RouteCollection());
@@ -164,10 +175,10 @@ public void NameIsInsertedInRouteDataTokens()
         {
             // Arrange
             var portalInfo = new ArrayList { new PortalInfo { PortalID = 0 } };
-            this._mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
-            var mockPac = new Mock<IPortalAliasController>();
-            mockPac.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
-            PortalAliasController.SetTestableInstance(mockPac.Object);
+            this.mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
+
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
 
             var routeCollection = new RouteCollection();
             var srm = new ServicesRoutingManager(routeCollection);
@@ -185,10 +196,10 @@ public void TwoRoutesOnTheSameFolderHaveSimilarNames()
         {
             // Arrange
             var portalInfo = new ArrayList { new PortalInfo { PortalID = 0 } };
-            this._mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
-            var mockPac = new Mock<IPortalAliasController>();
-            mockPac.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
-            PortalAliasController.SetTestableInstance(mockPac.Object);
+            this.mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
+
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
 
             var routeCollection = new RouteCollection();
             var srm = new ServicesRoutingManager(routeCollection);
@@ -209,10 +220,10 @@ public void RoutesShouldHaveBackwardCompability()
         {
             // Arrange
             var portalInfo = new ArrayList { new PortalInfo { PortalID = 0 } };
-            this._mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
-            var mockPac = new Mock<IPortalAliasController>();
-            mockPac.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
-            PortalAliasController.SetTestableInstance(mockPac.Object);
+            this.mockPortalController.Setup(x => x.GetPortals()).Returns(portalInfo);
+
+            this.mockPortalAliasService.Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
+            this.mockPortalAliasService.As<IPortalAliasController>().Setup(x => x.GetPortalAliasesByPortalId(0)).Returns(new[] { new PortalAliasInfo { HTTPAlias = "www.foo.com" } });
 
             var routeCollection = new RouteCollection();
             var srm = new ServicesRoutingManager(routeCollection);
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/SearchServiceControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/SearchServiceControllerTests.cs
index 875786e47d6..3264a5adb08 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/SearchServiceControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/SearchServiceControllerTests.cs	
@@ -12,6 +12,7 @@ namespace DotNetNuke.Tests.Web.InternalServices
     using System.Net.Http;
     using System.Web.Http;
     using System.Web.Http.Hosting;
+
     using DotNetNuke.Abstractions;
     using DotNetNuke.Abstractions.Application;
     using DotNetNuke.Common;
@@ -32,8 +33,11 @@ namespace DotNetNuke.Tests.Web.InternalServices
     using DotNetNuke.Web.Api;
     using DotNetNuke.Web.InternalServices;
     using DotNetNuke.Web.InternalServices.Views.Search;
+
     using Microsoft.Extensions.DependencyInjection;
+
     using Moq;
+
     using NUnit.Framework;
 
     using Constants = DotNetNuke.Services.Search.Internals.Constants;
@@ -78,19 +82,19 @@ public class SearchServiceControllerTests
         private const string SearchIndexFolder = @"App_Data\SearchTests";
         private const int DefaultSearchRetryTimes = 5;
 
-        private readonly double _readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
-        private Mock<ICBO> _mockCBO;
-        private Mock<IHostController> _mockHostController;
-        private Mock<CachingProvider> _mockCachingProvider;
-        private Mock<DataProvider> _mockDataProvider;
-        private Mock<ILocaleController> _mockLocaleController;
-        private Mock<IDataService> _mockDataService;
-        private Mock<IUserController> _mockUserController;
-        private Mock<IModuleController> _mockModuleController;
-        private Mock<ITabController> _mockTabController;
-        private SearchServiceController _searchServiceController;
-        private IInternalSearchController _internalSearchController;
-        private LuceneControllerImpl _luceneController;
+        private readonly double readerStaleTimeSpan = TimeSpan.FromMilliseconds(100).TotalSeconds;
+        private Mock<ICBO> mockCBO;
+        private Mock<IHostController> mockHostController;
+        private Mock<CachingProvider> mockCachingProvider;
+        private Mock<DataProvider> mockDataProvider;
+        private Mock<ILocaleController> mockLocaleController;
+        private Mock<IDataService> mockDataService;
+        private Mock<IUserController> mockUserController;
+        private Mock<IModuleController> mockModuleController;
+        private Mock<ITabController> mockTabController;
+        private SearchServiceController searchServiceController;
+        private IInternalSearchController internalSearchController;
+        private LuceneControllerImpl luceneController;
 
         [SetUp]
         public void SetUp()
@@ -102,16 +106,17 @@ public void SetUp()
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddTransient<IApplicationStatusInfo>(container => new DotNetNuke.Application.ApplicationStatusInfo(Mock.Of<IApplicationInfo>()));
             serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService, HostController>();
             Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
 
-            this._mockDataProvider = MockComponentProvider.CreateDataProvider();
-            this._mockLocaleController = MockComponentProvider.CreateLocaleController();
-            this._mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
-            this._mockDataService = new Mock<IDataService>();
-            this._mockUserController = new Mock<IUserController>();
-            this._mockModuleController = new Mock<IModuleController>();
-            this._mockTabController = new Mock<ITabController>();
-            this._mockHostController = new Mock<IHostController>();
+            this.mockDataProvider = MockComponentProvider.CreateDataProvider();
+            this.mockLocaleController = MockComponentProvider.CreateLocaleController();
+            this.mockCachingProvider = MockComponentProvider.CreateDataCacheProvider();
+            this.mockDataService = new Mock<IDataService>();
+            this.mockUserController = new Mock<IUserController>();
+            this.mockModuleController = new Mock<IModuleController>();
+            this.mockTabController = new Mock<ITabController>();
+            this.mockHostController = new Mock<IHostController>();
 
             this.SetupDataProvider();
             this.SetupHostController();
@@ -120,15 +125,15 @@ public void SetUp()
             this.SetupModuleController();
             this.DeleteIndexFolder();
 
-            TabController.SetTestableInstance(this._mockTabController.Object);
-            this._internalSearchController = InternalSearchController.Instance;
+            TabController.SetTestableInstance(this.mockTabController.Object);
+            this.internalSearchController = InternalSearchController.Instance;
 
-            this._mockCBO = new Mock<ICBO>();
+            this.mockCBO = new Mock<ICBO>();
             var tabKey = string.Format("{0}-{1}", TabSearchTypeId, 0);
             var userKey = string.Format("{0}-{1}", UserSearchTypeId, 0);
-            this._mockCBO.Setup(c => c.GetCachedObject<IDictionary<string, string>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), It.IsAny<bool>()))
+            this.mockCBO.Setup(c => c.GetCachedObject<IDictionary<string, string>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), It.IsAny<bool>()))
                     .Returns(new Dictionary<string, string>() { { tabKey, TabSearchTypeName }, { userKey, UserSearchTypeName } });
-            CBO.SetTestableInstance(this._mockCBO.Object);
+            CBO.SetTestableInstance(this.mockCBO.Object);
 
             // create instance of the SearchServiceController
             var request = new HttpRequestMessage();
@@ -138,7 +143,7 @@ public void SetUp()
             provider.Setup(x => x.TryFindModuleInfo(request, out expectedModule)).Returns(true);
             configuration.AddTabAndModuleInfoProvider(provider.Object);
             request.Properties[HttpPropertyKeys.HttpConfigurationKey] = configuration;
-            this._searchServiceController = new SearchServiceController(HtmlModDefId) { Request = request };
+            this.searchServiceController = new SearchServiceController(HtmlModDefId) { Request = request };
 
             this.CreateNewLuceneControllerInstance();
         }
@@ -147,7 +152,7 @@ public void SetUp()
         public void TearDown()
         {
             Globals.DependencyProvider = null;
-            this._luceneController.Dispose();
+            this.luceneController.Dispose();
             this.DeleteIndexFolder();
             CBO.ClearInstance();
             TabController.ClearInstance();
@@ -177,12 +182,12 @@ public void GetSearchResultsDetailed()
 
             // user doc
             var userdoc = new SearchDocument { UniqueKey = "key06", Url = userUrl, Title = keyword, SearchTypeId = UserSearchTypeId, ModifiedTimeUtc = DateTime.UtcNow, RoleId = RoleId731 };
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(doc3);
-            this._internalSearchController.AddSearchDocument(doc4);
-            this._internalSearchController.AddSearchDocument(doc5);
-            this._internalSearchController.AddSearchDocument(userdoc);
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(doc3);
+            this.internalSearchController.AddSearchDocument(doc4);
+            this.internalSearchController.AddSearchDocument(doc5);
+            this.internalSearchController.AddSearchDocument(userdoc);
 
             var query = new SearchQuery
             {
@@ -223,10 +228,10 @@ public void GetSearchResultsBasic()
             var doc2 = new SearchDocument { UniqueKey = "key02", TabId = TabId2, Url = tabUrl2, Title = keyword, SearchTypeId = TabSearchTypeId, ModifiedTimeUtc = now, PortalId = PortalId0, RoleId = RoleId0 };
             var userdoc = new SearchDocument { UniqueKey = "key03", Url = userUrl, Title = keyword, SearchTypeId = UserSearchTypeId, ModifiedTimeUtc = now, PortalId = PortalId0, RoleId = RoleId0 };
 
-            this._internalSearchController.AddSearchDocument(doc1);
-            this._internalSearchController.AddSearchDocument(doc2);
-            this._internalSearchController.AddSearchDocument(userdoc);
-            this._internalSearchController.Commit();
+            this.internalSearchController.AddSearchDocument(doc1);
+            this.internalSearchController.AddSearchDocument(doc2);
+            this.internalSearchController.AddSearchDocument(userdoc);
+            this.internalSearchController.Commit();
 
             var query = new SearchQuery
             {
@@ -286,8 +291,8 @@ public void ModifyingDocumentsDoesNotCreateDuplicates()
                 NumericKeys = { { "points", 5 } },
             };
 
-            this._internalSearchController.AddSearchDocument(originalDocument);
-            this._internalSearchController.Commit();
+            this.internalSearchController.AddSearchDocument(originalDocument);
+            this.internalSearchController.Commit();
 
             var modifiedDocument = new SearchDocument
             {
@@ -304,8 +309,8 @@ public void ModifyingDocumentsDoesNotCreateDuplicates()
                 NumericKeys = { { "points", 8 }, { "point2", 7 } },
             };
 
-            this._internalSearchController.AddSearchDocument(modifiedDocument);
-            this._internalSearchController.Commit();
+            this.internalSearchController.AddSearchDocument(modifiedDocument);
+            this.internalSearchController.Commit();
 
             var query = new SearchQuery
             {
@@ -334,62 +339,62 @@ public void ModifyingDocumentsDoesNotCreateDuplicates()
 
         private void CreateNewLuceneControllerInstance()
         {
-            if (this._luceneController != null)
+            if (this.luceneController != null)
             {
                 LuceneController.ClearInstance();
-                this._luceneController.Dispose();
+                this.luceneController.Dispose();
             }
 
-            this._luceneController = new LuceneControllerImpl();
-            LuceneController.SetTestableInstance(this._luceneController);
+            this.luceneController = new LuceneControllerImpl();
+            LuceneController.SetTestableInstance(this.luceneController);
         }
 
         private void SetupUserController()
         {
-            this._mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>())).Returns(
+            this.mockUserController.Setup(c => c.GetUserById(It.IsAny<int>(), It.IsAny<int>())).Returns(
             new UserInfo { UserID = UserId1, Username = UserName1, Profile = new UserProfile { } });
-            UserController.SetTestableInstance(this._mockUserController.Object);
+            UserController.SetTestableInstance(this.mockUserController.Object);
         }
 
         private void SetupHostController()
         {
-            this._mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(
+            this.mockHostController.Setup(c => c.GetString(Constants.SearchIndexFolderKey, It.IsAny<string>())).Returns(
                 SearchIndexFolder);
-            this._mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).
-                Returns(this._readerStaleTimeSpan);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetDouble(Constants.SearchReaderRefreshTimeKey, It.IsAny<double>())).
+                Returns(this.readerStaleTimeSpan);
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTitleBoostSetting, It.IsAny<int>())).Returns(
                 Constants.DefaultSearchTitleBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchTagBoostSetting, It.IsAny<int>())).Returns(
                 Constants.DefaultSearchTagBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchContentBoostSetting, It.IsAny<int>())).Returns(
                 Constants.DefaultSearchKeywordBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchDescriptionBoostSetting, It.IsAny<int>())).
                 Returns(Constants.DefaultSearchDescriptionBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchAuthorBoostSetting, It.IsAny<int>())).Returns(
                 Constants.DefaultSearchAuthorBoost);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMinLengthKey, It.IsAny<int>())).Returns(
                 Constants.DefaultMinLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchMaxLengthKey, It.IsAny<int>())).Returns(
                 Constants.DefaultMaxLen);
-            this._mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(
+            this.mockHostController.Setup(c => c.GetInteger(Constants.SearchRetryTimesKey, It.IsAny<int>())).Returns(
                 DefaultSearchRetryTimes);
-            HostController.RegisterInstance(this._mockHostController.Object);
+            HostController.RegisterInstance(this.mockHostController.Object);
         }
 
         private void SetupDataProvider()
         {
             // Standard DataProvider Path for Logging
-            this._mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
+            this.mockDataProvider.Setup(d => d.GetProviderPath()).Returns(string.Empty);
 
-            this._mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
-            this._mockDataProvider.Setup(d => d.GetSearchModules(It.IsAny<int>())).Returns(this.GetSearchModules);
-            this._mockDataProvider.Setup(d => d.GetModuleDefinitions()).Returns(this.GetModuleDefinitions);
-            this._mockDataProvider.Setup(d => d.GetAllSearchTypes()).Returns(this.GetAllSearchTypes);
-            this._mockDataProvider.Setup(d => d.GetUser(It.IsAny<int>(), It.IsAny<int>())).Returns(this.GetUser);
-            this._mockDataProvider.Setup(d => d.GetTabs(It.IsAny<int>())).Returns(this.GetTabs);
-            this._mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(this.GetPortalGroups);
+            this.mockDataProvider.Setup(d => d.GetPortals(It.IsAny<string>())).Returns<string>(this.GetPortalsCallBack);
+            this.mockDataProvider.Setup(d => d.GetSearchModules(It.IsAny<int>())).Returns(this.GetSearchModules);
+            this.mockDataProvider.Setup(d => d.GetModuleDefinitions()).Returns(this.GetModuleDefinitions);
+            this.mockDataProvider.Setup(d => d.GetAllSearchTypes()).Returns(this.GetAllSearchTypes);
+            this.mockDataProvider.Setup(d => d.GetUser(It.IsAny<int>(), It.IsAny<int>())).Returns(this.GetUser);
+            this.mockDataProvider.Setup(d => d.GetTabs(It.IsAny<int>())).Returns(this.GetTabs);
+            this.mockDataService.Setup(ds => ds.GetPortalGroups()).Returns(this.GetPortalGroups);
 
-            DataService.RegisterInstance(this._mockDataService.Object);
+            DataService.RegisterInstance(this.mockDataService.Object);
         }
 
         private void SetupPortalSettings()
@@ -401,16 +406,16 @@ private void SetupPortalSettings()
 
         private void SetupModuleController()
         {
-            this._mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId1), It.Is<int>(p => p == PortalId0), false)).Returns(
+            this.mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId1), It.Is<int>(p => p == PortalId0), false)).Returns(
     new ModuleInfo { ModuleID = HtmlModuleId1, ModuleDefID = HtmlModDefId, ModuleTitle = HtmlModuleTitle1 });
-            this._mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId2), It.Is<int>(p => p == PortalId0), false)).Returns(
+            this.mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId2), It.Is<int>(p => p == PortalId0), false)).Returns(
             new ModuleInfo { ModuleID = HtmlModuleId2, ModuleDefID = HtmlModDefId, ModuleTitle = HtmlModuleTitle2 });
-            this._mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId3), It.Is<int>(p => p == PortalId0), false)).Returns(
+            this.mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId3), It.Is<int>(p => p == PortalId0), false)).Returns(
             new ModuleInfo { ModuleID = HtmlModuleId3, ModuleDefID = HtmlModDefId, ModuleTitle = HtmlModuleTitle3 });
 
-            this._mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId4), It.Is<int>(p => p == PortalId0), false)).Returns(
+            this.mockModuleController.Setup(mc => mc.GetModule(It.Is<int>(m => m == HtmlModuleId4), It.Is<int>(p => p == PortalId0), false)).Returns(
             new ModuleInfo { ModuleID = HtmlModuleId4, ModuleDefID = HtmlModDefId, ModuleTitle = HtmlModuleTitle4 });
-            ModuleController.SetTestableInstance(this._mockModuleController.Object);
+            ModuleController.SetTestableInstance(this.mockModuleController.Object);
         }
 
         private void DeleteIndexFolder()
@@ -719,7 +724,7 @@ private IEnumerable<GroupedBasicView> GetGroupBasicViewResults(SearchQuery query
                 LocalizedName = UserSearchTypeName,
                 ModuleDefinitionId = 0,
             };
-            var results = this._searchServiceController.GetGroupedBasicViews(query, userSearchContentSource, PortalId0);
+            var results = this.searchServiceController.GetGroupedBasicViews(query, userSearchContentSource, PortalId0);
             return results;
         }
 
@@ -727,7 +732,7 @@ private IEnumerable<GroupedDetailView> GetGroupedDetailViewResults(SearchQuery s
         {
             bool more = false;
             int totalHits = 0;
-            var results = this._searchServiceController.GetGroupedDetailViews(searchQuery, UserSearchTypeId, out totalHits, out more);
+            var results = this.searchServiceController.GetGroupedDetailViews(searchQuery, UserSearchTypeId, out totalHits, out more);
             return results;
         }
     }
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/TabVersionControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/TabVersionControllerTests.cs
index 6f0f488cd7c..633e76ac5a1 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/TabVersionControllerTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/InternalServices/TabVersionControllerTests.cs	
@@ -2,158 +2,170 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.Tests.Web.InternalServices
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using DotNetNuke.Common;
-    using DotNetNuke.Common.Utilities;
-    using DotNetNuke.Entities.Controllers;
-    using DotNetNuke.Entities.Tabs.TabVersions;
-    using DotNetNuke.Entities.Users;
-    using DotNetNuke.Tests.Utilities.Mocks;
-    using Moq;
-    using NUnit.Framework;
-
-    [TestFixture]
-    public class TabVersionControllerTests
-    {
-        private const int UserID = 1;
-        private const int TabID = 99;
-        private readonly DateTime ServerCreateOnDate = new DateTime(2018, 08, 15, 12, 0, 0, DateTimeKind.Unspecified);
-
-        private Mock<ICBO> _mockCBO;
-        private Mock<IUserController> _mockUserController;
-        private Mock<IHostController> _mockHostController;
-
-        [SetUp]
-        public void Setup()
-        {
-            MockComponentProvider.ResetContainer();
-            this.SetupCBO();
-            this.SetupHostController();
-        }
-
-        [Test]
-        [TestCaseSource(typeof(TestCaseFactory), "TestCases")]
-        public void GetTabVersions_Verify_User_Preferred_TimeZone(string userPreferredTimeZone, DateTime expectedDateTime)
-        {
-            // Arrange
-            this.SetupUserController(userPreferredTimeZone);
-
-            // Act
-            var tabVersionController = new TabVersionControllerTestable();
-            var tabVersions = tabVersionController.GetTabVersions(TabID);
-            var tabVersion = tabVersions.FirstOrDefault();
-            var user = UserController.Instance.GetCurrentUserInfo();
-            var userTimeZone = user.Profile.PreferredTimeZone;
-
-            var localizedDate = TimeZoneInfo.ConvertTime(tabVersion.CreatedOnDate, DateUtilsTestable.GetDatabaseDateTimeOffset(), userTimeZone);
-
-            // Assert
-            Assert.AreEqual(localizedDate, expectedDateTime);
-        }
-
-        private void SetupCBO()
-        {
-            this._mockCBO = new Mock<ICBO>();
-            this._mockCBO.Setup(c => c.GetCachedObject<List<TabVersion>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), It.IsAny<bool>()))
-                .Returns(this.GetMockedTabVersions);
-            CBO.SetTestableInstance(this._mockCBO.Object);
-        }
-
-        private void SetupUserController(string timeZoneId)
-        {
-            this._mockUserController = new Mock<IUserController>();
-            this._mockUserController.Setup<UserInfo>(userController => userController.GetCurrentUserInfo()).Returns(this.GetMockedUser(timeZoneId));
-            UserController.SetTestableInstance(this._mockUserController.Object);
-        }
-
-        private UserInfo GetMockedUser(string timeZoneId)
-        {
-            var profile = new UserProfile()
-            {
-                PreferredTimeZone = this.GetMockedUserTimeZone(timeZoneId),
-            };
-
-            profile.ProfileProperties.Add(new Entities.Profile.ProfilePropertyDefinition(99)
-            {
-                CreatedByUserID = UserID,
-                PropertyDefinitionId = 20,
-                PropertyCategory = "Preferences",
-                PropertyName = "PreferredTimeZone",
-                PropertyValue = this.GetMockedUserTimeZone(timeZoneId).Id,
-            });
-            var user = new UserInfo()
-            {
-                Profile = profile,
-                UserID = UserID,
-                PortalID = 99,
-            };
-
-            return user;
-        }
-
-        private TimeZoneInfo GetMockedUserTimeZone(string timeZoneId)
-        {
-            return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
-        }
-
-        private TabVersion GetMockedTabVersion()
-        {
-            var tabVersion = new TabVersion
-            {
-                IsPublished = true,
-                TabId = TabID,
-                TabVersionId = 1,
-                Version = 1,
-                CreatedByUserID = UserID,
-            };
-            tabVersion.GetType().BaseType.GetProperty("CreatedOnDate").SetValue(tabVersion, this.ServerCreateOnDate, null);
-
-            return tabVersion;
-        }
-
-        private List<TabVersion> GetMockedTabVersions()
-        {
-            return new List<TabVersion>()
-            {
-                this.GetMockedTabVersion(),
-            };
-        }
-
-        private void SetupHostController()
-        {
-            this._mockHostController = new Mock<IHostController>();
-            this._mockHostController.Setup(c => c.GetString(It.IsRegex("PerformanceSetting"))).Returns(Globals.PerformanceSettings.LightCaching.ToString());
-            HostController.RegisterInstance(this._mockHostController.Object);
-        }
-
-        private class TabVersionControllerTestable : TabVersionController
-        {}
-
-        private class DateUtilsTestable : DateUtils
-        {
-            public static new TimeZoneInfo GetDatabaseDateTimeOffset()
-            {
-                var timeZoneId = "UTC";
-                return TimeZoneInfo.CreateCustomTimeZone(timeZoneId, new TimeSpan(0, 0, 0), timeZoneId, timeZoneId);
-            }
-        }
-
-        private class TestCaseFactory
-        {
-            public static IEnumerable TestCases()
-            {
-                yield return new TestCaseData("Central European Standard Time", new DateTime(2018, 08, 15, 14, 0, 0));
-                yield return new TestCaseData("Russian Standard Time", new DateTime(2018, 08, 15, 15, 0, 0));
-                yield return new TestCaseData("SE Asia Standard Time", new DateTime(2018, 08, 15, 19, 0, 0));
-            }
-        }
-
-        // Assuming 12:00 Aug 15, 2018 server local time
-    }
-}
+namespace DotNetNuke.Tests.Web.InternalServices
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using DotNetNuke.Abstractions;
+    using DotNetNuke.Abstractions.Application;
+    using DotNetNuke.Common;
+    using DotNetNuke.Common.Utilities;
+    using DotNetNuke.Entities.Controllers;
+    using DotNetNuke.Entities.Tabs.TabVersions;
+    using DotNetNuke.Entities.Users;
+    using DotNetNuke.Tests.Utilities.Mocks;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class TabVersionControllerTests
+    {
+        private const int UserID = 1;
+        private const int TabID = 99;
+        private readonly DateTime ServerCreateOnDate = new DateTime(2018, 08, 15, 12, 0, 0, DateTimeKind.Unspecified);
+
+        private Mock<ICBO> mockCBO;
+        private Mock<IUserController> mockUserController;
+        private Mock<IHostController> mockHostController;
+
+        [SetUp]
+        public void Setup()
+        {
+            MockComponentProvider.ResetContainer();
+            this.SetupCBO();
+            this.SetupHostController();
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddTransient<IApplicationStatusInfo>(container => Mock.Of<IApplicationStatusInfo>());
+            serviceCollection.AddTransient<INavigationManager>(container => Mock.Of<INavigationManager>());
+            serviceCollection.AddTransient<IHostSettingsService>(container => (IHostSettingsService)this.mockHostController.Object);
+            Globals.DependencyProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        [Test]
+        [TestCaseSource(typeof(TestCaseFactory), "TestCases")]
+        public void GetTabVersions_Verify_User_Preferred_TimeZone(string userPreferredTimeZone, DateTime expectedDateTime)
+        {
+            // Arrange
+            this.SetupUserController(userPreferredTimeZone);
+
+            // Act
+            var tabVersionController = new TabVersionControllerTestable();
+            var tabVersions = tabVersionController.GetTabVersions(TabID);
+            var tabVersion = tabVersions.FirstOrDefault();
+            var user = UserController.Instance.GetCurrentUserInfo();
+            var userTimeZone = user.Profile.PreferredTimeZone;
+
+            var localizedDate = TimeZoneInfo.ConvertTime(tabVersion.CreatedOnDate, DateUtilsTestable.GetDatabaseDateTimeOffset(), userTimeZone);
+
+            // Assert
+            Assert.AreEqual(localizedDate, expectedDateTime);
+        }
+
+        private void SetupCBO()
+        {
+            this.mockCBO = new Mock<ICBO>();
+            this.mockCBO.Setup(c => c.GetCachedObject<List<TabVersion>>(It.IsAny<CacheItemArgs>(), It.IsAny<CacheItemExpiredCallback>(), It.IsAny<bool>()))
+                .Returns(this.GetMockedTabVersions);
+            CBO.SetTestableInstance(this.mockCBO.Object);
+        }
+
+        private void SetupUserController(string timeZoneId)
+        {
+            this.mockUserController = new Mock<IUserController>();
+            this.mockUserController.Setup<UserInfo>(userController => userController.GetCurrentUserInfo()).Returns(this.GetMockedUser(timeZoneId));
+            UserController.SetTestableInstance(this.mockUserController.Object);
+        }
+
+        private UserInfo GetMockedUser(string timeZoneId)
+        {
+            var profile = new UserProfile()
+            {
+                PreferredTimeZone = this.GetMockedUserTimeZone(timeZoneId),
+            };
+
+            profile.ProfileProperties.Add(new Entities.Profile.ProfilePropertyDefinition(99)
+            {
+                CreatedByUserID = UserID,
+                PropertyDefinitionId = 20,
+                PropertyCategory = "Preferences",
+                PropertyName = "PreferredTimeZone",
+                PropertyValue = this.GetMockedUserTimeZone(timeZoneId).Id,
+            });
+            var user = new UserInfo()
+            {
+                Profile = profile,
+                UserID = UserID,
+                PortalID = 99,
+            };
+
+            return user;
+        }
+
+        private TimeZoneInfo GetMockedUserTimeZone(string timeZoneId)
+        {
+            return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+        }
+
+        private TabVersion GetMockedTabVersion()
+        {
+            var tabVersion = new TabVersion
+            {
+                IsPublished = true,
+                TabId = TabID,
+                TabVersionId = 1,
+                Version = 1,
+                CreatedByUserID = UserID,
+            };
+            tabVersion.GetType().BaseType.GetProperty("CreatedOnDate").SetValue(tabVersion, this.ServerCreateOnDate, null);
+
+            return tabVersion;
+        }
+
+        private List<TabVersion> GetMockedTabVersions()
+        {
+            return new List<TabVersion>()
+            {
+                this.GetMockedTabVersion(),
+            };
+        }
+
+        private void SetupHostController()
+        {
+            this.mockHostController = new Mock<IHostController>();
+            this.mockHostController.Setup(c => c.GetString(It.IsRegex("PerformanceSetting"))).Returns(Globals.PerformanceSettings.LightCaching.ToString());
+            this.mockHostController.As<IHostSettingsService>();
+        }
+
+        private class TabVersionControllerTestable : TabVersionController
+        {}
+
+        private class DateUtilsTestable : DateUtils
+        {
+            public static new TimeZoneInfo GetDatabaseDateTimeOffset()
+            {
+                var timeZoneId = "UTC";
+                return TimeZoneInfo.CreateCustomTimeZone(timeZoneId, new TimeSpan(0, 0, 0), timeZoneId, timeZoneId);
+            }
+        }
+
+        private class TestCaseFactory
+        {
+            public static IEnumerable TestCases()
+            {
+                yield return new TestCaseData("Central European Standard Time", new DateTime(2018, 08, 15, 14, 0, 0));
+                yield return new TestCaseData("Russian Standard Time", new DateTime(2018, 08, 15, 15, 0, 0));
+                yield return new TestCaseData("SE Asia Standard Time", new DateTime(2018, 08, 15, 19, 0, 0));
+            }
+        }
+
+        // Assuming 12:00 Aug 15, 2018 server local time
+    }
+}
diff --git a/DNN Platform/Website/ErrorPage.aspx b/DNN Platform/Website/ErrorPage.aspx
index 89baf0b5225..bf0e0c9c2ae 100644
--- a/DNN Platform/Website/ErrorPage.aspx	
+++ b/DNN Platform/Website/ErrorPage.aspx	
@@ -16,7 +16,7 @@
 	        </tr>
 	        <tr style="height:100%;">
 		        <td valign="top" style="width:650px;">
-                    <h2>DNN Error</h2>
+                    <h2>Application Error</h2>
                     <hr />
                     <p><asp:PlaceHolder ID="ErrorPlaceHolder" runat="server" /></p>
                 </td>
diff --git a/DNN Platform/Website/Install/App_LocalResources/Installwizard.aspx.nl-NL.resx b/DNN Platform/Website/Install/App_LocalResources/Installwizard.aspx.nl-NL.resx
index 7dc45beb330..2a030dcbc17 100644
--- a/DNN Platform/Website/Install/App_LocalResources/Installwizard.aspx.nl-NL.resx	
+++ b/DNN Platform/Website/Install/App_LocalResources/Installwizard.aspx.nl-NL.resx	
@@ -184,16 +184,16 @@
     <value>Controle van machtiging op mappen en bestanden</value>
   </data>
   <data name="FileAndFolderPermissionCheckFailed.Text" xml:space="preserve">
-    <value>&amp;lt;div class="permission"&amp;gt;&amp;lt;img alt=afbeelding geeft de beveiligingsintellingen van de hoofdfolder van de website weer, Dit moet zijn Lezen, Schrijven en Wijzingen voor de ASPNET of NT AUTHORITY/NETWORK SERVICE accounts." src="..\403-3.gif" align="right" hspace="10"/&amp;gt;
+    <value>&amp;lt;div class="permission"&amp;gt;&amp;lt;img alt=afbeelding geeft de beveiligingsintellingen van de hoofdfolder van de website weer, Dit moet zijn Lezen, Schrijven en Wijzigen voor de ASPNET of NT AUTHORITY/NETWORK SERVICE accounts." src="..\403-3.gif" align="right" hspace="10"/&amp;gt;
 &amp;lt;p&amp;gt;&amp;lt;b&amp;gt;&amp;lt;font color='red'&amp;gt;De website voldoet niet aan de beveiligingscheck&amp;lt;/font&amp;gt;&amp;lt;/b&amp;gt;&amp;lt;/p&amp;gt;
-Bij gebruik van Windows Explorer, browse naar de folders van uw website ( {0} ). Rechter muis klik op de  folder en selecteer delen en beveiliging uit het popup menu. selecteer de beveiligings tab. Voeg de vereiste gebruikers toe en stel de juiste rechten in.
+Bij gebruik van Windows Explorer, browse naar de folders van uw website ( {0} ). Rechtermuisklik op de  folder en selecteer Delen en Beveiliging in het popupmenu. Selecteer de beveiligingstab. Voeg de vereiste gebruikers toe en stel de juiste rechten in.
 &amp;lt;br/&amp;gt;&amp;lt;br/&amp;gt;
 &amp;lt;h3&amp;gt;Bij gebruik van Windows 2000 - IIS5&amp;lt;/h3&amp;gt;
-&amp;lt;p&amp;gt;De ASPNET User Account moet Lees, Schrijf, en wijzing rechten hebben op de hoofdfolder van uw website&amp;lt;/p&amp;gt;
+&amp;lt;p&amp;gt;De ASPNET User Account moet Lees, Schrijf, en Wijzigrechten hebben op de hoofdfolder van uw website&amp;lt;/p&amp;gt;
 &amp;lt;h3&amp;gt;Bij gebruik van Windows 2003, Windows Vista of Windows Server 2008 en  IIS6 of IIS7&amp;lt;/h3&amp;gt;
-&amp;lt;p&amp;gt;De NT AUTHORITY\NETWORK SERVICE User Account moet lees, Schrijf, en Wijzing rechten hebben op de hoofd folder van uw website.&amp;lt;/p&amp;gt;
+&amp;lt;p&amp;gt;De NT AUTHORITY\NETWORK SERVICE User Account moet Lees, Schrijf en Wijzigrechten hebben op de hoofdfolder van uw website.&amp;lt;/p&amp;gt;
 &amp;lt;h3&amp;gt;Bij gebruik van Windows 7 of Windows Server 2008 R2 en  IIS7.5&amp;lt;/h3&amp;gt;
-&amp;lt;p&amp;gt;Moet de IIS AppPool\DefaultAppPool User Account Lees, Schrijf, en Wijzig rechten hebben op de hoofd folder van uw website.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;&amp;lt;a class="dnnPrimaryAction" href=""&amp;gt;Recheck&amp;lt;/a&amp;gt;&amp;lt;/p&amp;gt;&amp;lt;/div&amp;gt;</value>
+&amp;lt;p&amp;gt;Moet de IIS AppPool\DefaultAppPool User Account Lees, Schrijf en Wijzigrechten hebben op de hoofdfolder van uw website.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;&amp;lt;a class="dnnPrimaryAction" href=""&amp;gt;Recheck&amp;lt;/a&amp;gt;&amp;lt;/p&amp;gt;&amp;lt;/div&amp;gt;</value>
   </data>
   <data name="FileAndFolderPermissionCheckTitle.Text" xml:space="preserve">
     <value>Controleren van machtiging op mappen en bestanden</value>
@@ -319,13 +319,13 @@ Bij gebruik van Windows Explorer, browse naar de folders van uw website ( {0} ).
     <value>Start installatie</value>
   </data>
   <data name="LegacyLangaugePack.Text" xml:space="preserve">
-    <value>Dit taalpakket is ouder dan de huidige applicatie versie: </value>
+    <value>Dit taalpakket is ouder dan de huidige applicatieversie: </value>
   </data>
   <data name="LicenseActivation.Text" xml:space="preserve">
     <value>Activeren van de licentie</value>
   </data>
   <data name="NoErrorsLogged.Text" xml:space="preserve">
-    <value>Er zijn geen installatie errors gelogd</value>
+    <value>Er zijn geen installatiefouten gelogd</value>
   </data>
   <data name="NoInstallationLog.Text" xml:space="preserve">
     <value>Geen installatielog</value>
diff --git a/DNN Platform/Website/Install/App_LocalResources/UpgradeWizard.aspx.nl-NL.resx b/DNN Platform/Website/Install/App_LocalResources/UpgradeWizard.aspx.nl-NL.resx
index 00308e59305..9d712f854c0 100644
--- a/DNN Platform/Website/Install/App_LocalResources/UpgradeWizard.aspx.nl-NL.resx	
+++ b/DNN Platform/Website/Install/App_LocalResources/UpgradeWizard.aspx.nl-NL.resx	
@@ -22,12 +22,12 @@
     <value>Accountinformatie</value>
   </data>
   <data name="BestPractices.Text" xml:space="preserve">
-    <value>Je staat op het punt om je website te upgraden naar een recentere versie van DNNPlatform. Het toepassen van upgrades op een consistente basis is de beste manier om ervoor te zorgen dat je de integriteit van de website en de veiligheid van de gebruikers garandeert &lt;br /&gt;
+    <value>Je staat op het punt om je website te upgraden naar een recentere versie van DNNPlatform. Het toepassen van upgrades op een consistente basis is de beste manier om ervoor te zorgen dat je de integriteit van de website en de veiligheid van de gebruikers garandeert. &lt;br /&gt;
 Voordat je verder gaat met het geautomatiseerde upgrade-proces moet je ervoor zorgen dat: 
 &lt;ul&gt;
-&lt;li&gt;je de upgrade eerst test in een testogeving,&lt;/li&gt;
+&lt;li&gt;je de upgrade eerst test in een testomgeving,&lt;/li&gt;
 &lt;li&gt;je de huidige installatie hebt gedocumenteerd&lt;/li&gt;
-&lt;li&gt;je modules van derde op compatibilietit hebt gecontroleerd&lt;/li&gt;
+&lt;li&gt;je modules van derden op compatibiliteit hebt gecontroleerd&lt;/li&gt;
 &lt;li&gt;je een backup hebt gemaakt van de productiesite, zodat je altijd terug kan als er iets mis gaat&lt;/li&gt;
 &lt;/ ul&gt;</value>
   </data>
diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/GridCell/index.jsx b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/GridCell/index.jsx
index 06fade2b851..71aaff1ca98 100644
--- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/GridCell/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/GridCell/index.jsx
@@ -4,13 +4,22 @@ import "./style.less";
 
 class GridCell extends Component {
     getStyle() {
-        const {props} = this;
-        return Object.assign({ width: (props.columnSize || 100) + (props.type ? props.type : "%") }, props.style);
+        const { props } = this;
+        return Object.assign(
+            { width: (props.columnSize || 100) + (props.type ? props.type : "%") },
+            props.style
+        );
     }
     render() {
-        const {props} = this;
+        const { props } = this;
         return (
-            <div className={"dnn-grid-cell " + props.className} style={this.getStyle() }>
+            <div
+                className={"dnn-grid-cell " + props.className}
+                style={this.getStyle()}
+                onClick={(e) => {
+                    if (props.onClick) props.onClick(e);
+                }}
+            >
                 {props.children}
             </div>
         );
@@ -19,14 +28,15 @@ class GridCell extends Component {
 
 GridCell.propTypes = {
     children: PropTypes.node,
-    columnSize: PropTypes.number,   
+    columnSize: PropTypes.number,
     type: PropTypes.string,
     style: PropTypes.object,
-    className: PropTypes.string
+    className: PropTypes.string,
+    onClick: PropTypes.func,
 };
 
 GridCell.defaultProps = {
-    className: ""
+    className: "",
 };
 
-export default GridCell;
\ No newline at end of file
+export default GridCell;
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
index 27afb7f3abc..8a441d32b40 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
@@ -6,6 +6,7 @@
     "start": "npm run webpack",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "set NODE_ENV=production&&webpack -p",
+    "debug": "set NODE_ENV=debug&&webpack -p",
     "watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
     "webpack": "webpack-dev-server -d --port 8050 --hot --inline --content-base dist/ --history-api-fallback"
   },
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
index d1e20a2f605..22f56ca3023 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/index.jsx
@@ -1,27 +1,45 @@
-import PropTypes from 'prop-types';
+import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { GridCell } from "@dnnsoftware/dnn-react-common";
 import "./style.less";
 
 class ExtensionHeader extends Component {
-    render() {
-        return (
-            <GridCell columnSize={100} className="header-row">
-                {
-                    this.props.headers.map((header, index) => {
-                        return <GridCell key={`header-row-grid-cell-${index}`} columnSize={header.size} className={header.header ? "" : "empty"}>
-                            <h6>{header.header || "Default"}</h6>
-                        </GridCell>;
-                    })
-                }
+  render() {
+    return (
+      <GridCell columnSize={100} className="header-row">
+        {this.props.headers.map((header, index) => {
+          return (
+            <GridCell
+              key={`header-row-grid-cell-${index}`}
+              columnSize={header.size}
+              className={
+                (header.header ? "" : "empty") +
+                (header.isSortable ? " sortable" : "")
+              }
+              onClick={(e) => {
+                if (this.props.changeSortOrder && header.isSortable)
+                  this.props.changeSortOrder(
+                    header.columnName,
+                    header.columnName == this.props.currentSortColumn
+                      ? !this.props.currentSortAscending
+                      : true
+                  );
+              }}
+            >
+              <h6>{header.header || "Default"}</h6>
             </GridCell>
-        );
-    }
+          );
+        })}
+      </GridCell>
+    );
+  }
 }
 
 ExtensionHeader.propTypes = {
-    headers: PropTypes.array.isRequired
+  headers: PropTypes.array.isRequired,
+  changeSortOrder: PropTypes.func,
+  currentSortAscending: PropTypes.bool,
+  currentSortColumn: PropTypes.string,
 };
 
-
-export default ExtensionHeader;
\ No newline at end of file
+export default ExtensionHeader;
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
index 57119cee18e..35613d7967b 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/HeaderRow/style.less
@@ -1,13 +1,16 @@
 @import "~@dnnsoftware/dnn-react-common/styles/index.less";
 .header-row {
-    padding: 10px 0 10px;
-    border-bottom: 1px solid @alto;
-    .dnn-grid-cell {
-        padding: 0 15px;
-    }
-    .dnn-grid-cell.empty{
-        text-indent: -100px;
-        overflow: hidden;
-    }
-    text-transform: uppercase;
-}
\ No newline at end of file
+  padding: 10px 0 10px;
+  border-bottom: 1px solid @alto;
+  .dnn-grid-cell {
+    padding: 0 15px;
+  }
+  .dnn-grid-cell.empty {
+    text-indent: -100px;
+    overflow: hidden;
+  }
+  text-transform: uppercase;
+  .sortable {
+    cursor: pointer;
+  }
+}
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx
index d34030e3cb5..ade746f8a74 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/src/components/UserTable/index.jsx
@@ -91,9 +91,9 @@ class UserTable extends Component {
             headers = [{index: 3, size: columnSizes.find(x=>x.index===3).size, header: ""}];
         }
         headers = headers.concat([
-            {index: 5, size: columnSizes.find(x=>x.index===5).size, header: Localization.get("Name.Header")},
-            {index: 10, size: columnSizes.find(x=>x.index===10).size, header: Localization.get("Email.Header")},
-            {index: 15, size: columnSizes.find(x=>x.index===15).size, header: Localization.get("Created.Header")},
+            {index: 5, size: columnSizes.find(x=>x.index===5).size, header: Localization.get("Name.Header"), isSortable: true, columnName: "DisplayName"},
+            {index: 10, size: columnSizes.find(x=>x.index===10).size, header: Localization.get("Email.Header"), isSortable: true, columnName: "Email"},
+            {index: 15, size: columnSizes.find(x=>x.index===15).size, header: Localization.get("Created.Header"), isSortable: true, columnName: "Joined"},
             {index: 25, size: columnSizes.find(x=>x.index===25).size, header:""}]);
         if (this.props.getUserColumns !== undefined  && typeof this.props.getUserColumns ==="function") {
             let extraColumns = this.props.getUserColumns();
@@ -120,7 +120,7 @@ class UserTable extends Component {
         const createUserBox = () => [<CreateUserBox key={`create-user-box-${i++}`} filter={props.filter} onCancel={this.collapse.bind(this) } appSettings={props.appSettings}/>];
         return (
             <GridCell className={styles.usersList}>
-                <HeaderRow headers={headers}/>
+                <HeaderRow headers={headers} changeSortOrder={props.changeSortOrder} currentSortAscending={props.currentSortAscending} currentSortColumn={props.currentSortColumn} />
                 <DetailRow
                     Collapse={this.toggle.bind(this) }
                     OpenCollapse={this.toggle.bind(this) }
@@ -173,6 +173,9 @@ class UserTable extends Component {
 
 UserTable.propTypes = {
     dispatch: PropTypes.func.isRequired,
+    changeSortOrder: PropTypes.func,
+    currentSortAscending: PropTypes.bool,
+    currentSortColumn: PropTypes.string,
     getUserTabs: PropTypes.func,
     getUserTabsIcons: PropTypes.func,
     getUserColumns: PropTypes.func,
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx b/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx
index a87d36bf324..7ced84a4eb8 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/components/Body/index.jsx
@@ -59,6 +59,14 @@ class Body extends Component {
         this.setState({ searchParameters });
     }
 
+    onSortChanged(columnName, ascending) {
+        let {searchParameters} = this.state;
+        searchParameters.sortColumn = columnName;
+        searchParameters.sortAscending = ascending;
+        this.props.dispatch(CommonUsersActions.getUsers(searchParameters));
+        this.setState({ searchParameters });
+    }
+
     getWorkSpaceTray() {
         return this.state.userFilters.length > 0 &&
             <GridCell className="users-workspace-tray">
@@ -111,7 +119,8 @@ class Body extends Component {
                     }
                 </PersonaBarPageHeader>
                 <PersonaBarPageBody workSpaceTrayVisible={true} workSpaceTrayOutside={true} workSpaceTray={this.getWorkSpaceTray() } className={panelBodyMargin}>
-                    <UserTable ref={(node) => this.userTable = node} appSettings={appSettings} filter={state.searchParameters.filter}/>
+                    <UserTable ref={(node) => this.userTable = node} appSettings={appSettings} filter={state.searchParameters.filter} 
+                            changeSortOrder={(c, a) => this.onSortChanged(c, a)} currentSortAscending={state.searchParameters.sortAscending} currentSortColumn={state.searchParameters.sortColumn} />
                     {
                         <div className="users-paging">
                             <Pager pageSizeDropDownWithoutBorder={true} 
diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
index ddc27912ad7..a8796c5bdc4 100644
--- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/src/components/VocabularyList/RightPane/index.jsx
@@ -10,20 +10,15 @@ import { GridCell, SvgIcons } from "@dnnsoftware/dnn-react-common";
 
 function findInChildren(list, parentTermId) {
     if (!list) {
-        return;
+        return null;
+    }
+    let parentTerm = null;
+    for (let i = 0; i < list.length && !parentTerm; i++) {
+        const term = list[i];
+        parentTerm = term.TermId === parentTermId
+            ? term
+            : findInChildren(term.ChildTerms, parentTermId);
     }
-    let parentTerm = {};
-    list.forEach((_term) => {
-        if (_term.TermId === parentTermId) {
-            parentTerm = _term;
-            return parentTerm;
-        } else {
-            if (findInChildren(_term.ChildTerms, parentTermId)) {
-                parentTerm = findInChildren(_term.ChildTerms, parentTermId);
-                return parentTerm;
-            }
-        }
-    });
     return parentTerm;
 }
 
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
index ba71ac36922..63fdc3c18b1 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Attributes/RegistrationFieldsAttribute.cs
@@ -16,14 +16,16 @@ namespace Dnn.PersonaBar.Security.Attributes
     [AttributeUsage(AttributeTargets.Property)]
     class RegistrationFieldsAttribute : ValidationAttribute
     {
-        public RegistrationFieldsAttribute(string registrationFormType, string requireUniqueDisplayName)
+        public RegistrationFieldsAttribute(string registrationFormType, string requireUniqueDisplayName, string displayNameFormat)
         {
             this.RegistrationFormTypePropertyName = registrationFormType;
-            this.RequireUniqueDisplayNamePropertyName = requireUniqueDisplayName;
+            this.RequireUniqueDisplayNamePropertyName = requireUniqueDisplayName;
+            this.DisplayNameFormatPropertyName = displayNameFormat;
         }
 
         public string RegistrationFormTypePropertyName { get; private set; }
-        public string RequireUniqueDisplayNamePropertyName { get; private set; }
+        public string RequireUniqueDisplayNamePropertyName { get; private set; }
+        public string DisplayNameFormatPropertyName { get; private set; }
 
         protected override ValidationResult IsValid(object value, ValidationContext validationContext)
         {
@@ -96,6 +98,22 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
                 {
                     PortalController.UpdatePortalSetting(portalId, "Registration_RegistrationFormType", "0", false);
                     return new ValidationResult(Localization.GetString(Constants.NoDisplayName, Constants.LocalResourcesFile));
+                }
+
+                var displayNameFormatValue = string.Empty;
+
+                try
+                {
+                    displayNameFormatValue = validationContext.ObjectType.GetProperty(this.DisplayNameFormatPropertyName).GetValue(validationContext.ObjectInstance, null).ToString();
+                }
+                catch
+                {
+                    return new ValidationResult(string.Format(Localization.GetString(Constants.NotValid, Constants.LocalResourcesFile), this.DisplayNameFormatPropertyName, displayNameFormatValue));
+                }
+
+                if (!registrationFields.Contains("DisplayName") && string.IsNullOrWhiteSpace(displayNameFormatValue))
+                {
+                    return new ValidationResult(Localization.GetString(Constants.IncorrectDisplayNameConfiguration, Constants.LocalResourcesFile));
                 }
             }
 
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
index 54df7fbc44a..fd10b9ba99e 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Security/Constants.cs
@@ -22,7 +22,8 @@ public static class Constants
         public const string NoEmail = "NoEmail";
         public const string ContainsDuplicateAddresses = "ContainsDuplicateAddresses";
         public const string DeletedTab = "DeletedTab";
-        public const string DisabledTab = "DisabledTab";
+        public const string DisabledTab = "DisabledTab";
+        public const string IncorrectDisplayNameConfiguration = "IncorrectDisplayNameConfiguration";
         public const string LocalResourcesFile = "~/DesktopModules/admin/Dnn.PersonaBar/Modules/Dnn.Security/App_LocalResources/Security.resx";
     }
 }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs
index fd967102273..f117288955d 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateRegistrationSettingsRequest.cs
@@ -20,7 +20,7 @@ public class UpdateRegistrationSettingsRequest
         [RegistrationFormTypeOption]
         public int RegistrationFormType { get; set; }
 
-        [RegistrationFields("RegistrationFormType", "RequireUniqueDisplayName")]
+        [RegistrationFields("RegistrationFormType", "RequireUniqueDisplayName", "DisplayNameFormat")]
         public string RegistrationFields { get; set; }
 
         public bool RequireUniqueDisplayName { get; set; }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
index b19db47aad6..9cd34567b9b 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
@@ -667,7 +667,7 @@
     <value>Allowable File Extensions:</value>
   </data>
   <data name="OtherSettingsUpdateSuccess.Text" xml:space="preserve">
-    <value>Settings has been updated.</value>
+    <value>Settings have been updated.</value>
   </data>
   <data name="OtherSettingsError.Text" xml:space="preserve">
     <value>Could not update settings. Please try later.</value>
@@ -1147,4 +1147,7 @@
   <data name="RedirectionMovedToSiteSettings.Text" xml:space="preserve">
     <value>Redirection has been moved to Site Settings</value>
   </data>
+  <data name="IncorrectDisplayNameConfiguration.Text" xml:space="preserve">
+    <value>The Display Name configuration is not correct. Either provide Display Name Format or include Display Name in the list of fields.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/gitversion.yml b/gitversion.yml
index 9da2681ae3e..bf289bdaf60 100644
--- a/gitversion.yml
+++ b/gitversion.yml
@@ -2,8 +2,9 @@ next-version: 9.6.0
 commit-date-format: 'yyyyMMdd'
 assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{CommitsSinceVersionSource}'
 mode: ContinuousDeployment
+ignore:
+  commits-before: 2020-01-01T00:00:00
 branches:
-
   future:
     regex: future?[/-]
     tag: 'alpha'