diff --git a/Habitat.sln b/Habitat.sln
index c08986542a..3016e8c424 100644
--- a/Habitat.sln
+++ b/Habitat.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.SitecoreExtensions", "src\foundation\SitecoreExtensions\code\Sitecore.Foundation.SitecoreExtensions.csproj", "{B535703F-8D07-4F23-A533-2974BB4CC7B1}"
 EndProject
@@ -157,6 +157,42 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{4B8BD204
 		uninstall-xp0.ps1 = uninstall-xp0.ps1
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{999D3649-47C8-4618-8870-1F423BF8E4FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Testing", "src\Foundation\Testing\tests\Sitecore.Foundation.Testing.csproj", "{7CC3D72B-4518-4B78-BE48-630A263C0F5B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Language.Tests", "src\Feature\Language\Tests\Sitecore.Feature.Language.Tests.csproj", "{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Maps.Tests", "src\Feature\Maps\tests\Sitecore.Feature.Maps.Tests.csproj", "{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Media.Tests", "src\Feature\Media\Tests\Sitecore.Feature.Media.Tests.csproj", "{097A482B-CD89-4BA9-939F-B232D35AF8E1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Multisite.Tests", "src\Feature\Multisite\tests\Sitecore.Feature.Multisite.Tests.csproj", "{B2D57490-58A9-4F73-A34E-B4076713F712}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.News.Tests", "src\Feature\News\Tests\Sitecore.Feature.News.Tests.csproj", "{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Person.Tests", "src\Feature\Person\tests\Sitecore.Feature.Person.Tests.csproj", "{931B6ABB-1791-44F8-9727-4110FB59C961}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.Teasers.Tests", "src\Feature\Teasers\tests\Sitecore.Feature.Teasers.Tests.csproj", "{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Alerts.Tests", "src\Foundation\Alerts\tests\Sitecore.Foundation.Alerts.Tests.csproj", "{EC2C5218-7C4E-4010-820B-8F2593E77AE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Dictionary.Tests", "src\Foundation\Dictionary\tests\Sitecore.Foundation.Dictionary.Tests.csproj", "{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.FieldEditor.Tests", "src\Foundation\FieldEditor\tests\Sitecore.Foundation.FieldEditor.Tests.csproj", "{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Indexing.Tests", "src\Foundation\Indexing\Tests\Sitecore.Foundation.Indexing.Tests.csproj", "{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Installer.Tests", "src\Foundation\Installer\tests\Sitecore.Foundation.Installer.Tests.csproj", "{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.LocalDatasource.Tests", "src\Foundation\LocalDatasource\tests\Sitecore.Foundation.LocalDatasource.Tests.csproj", "{1E797ECB-D017-4ED6-8706-BC89B556F26C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Multisite.Tests", "src\Foundation\Multisite\tests\Sitecore.Foundation.Multisite.Tests.csproj", "{57295D42-6C03-455B-8202-12AEAF233677}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.SitecoreExtensions.Tests", "src\Foundation\SitecoreExtensions\Tests\Sitecore.Foundation.SitecoreExtensions.Tests.csproj", "{85F735B7-9BEE-43C3-94DF-539CE267F0B9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Theming.Tests", "src\Foundation\Theming\tests\Sitecore.Foundation.Theming.Tests.csproj", "{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -411,6 +447,142 @@ Global
 		{622EBD86-43A5-4857-965C-1724F714012A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{622EBD86-43A5-4857-965C-1724F714012A}.Release|x64.ActiveCfg = Release|Any CPU
 		{622EBD86-43A5-4857-965C-1724F714012A}.Release|x64.Build.0 = Release|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B}.Release|x64.Build.0 = Release|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Debug|x64.Build.0 = Debug|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Release|x64.ActiveCfg = Release|Any CPU
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928}.Release|x64.Build.0 = Release|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Debug|x64.Build.0 = Debug|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Release|x64.ActiveCfg = Release|Any CPU
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F}.Release|x64.Build.0 = Release|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1}.Release|x64.Build.0 = Release|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Debug|x64.Build.0 = Debug|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Release|x64.ActiveCfg = Release|Any CPU
+		{B2D57490-58A9-4F73-A34E-B4076713F712}.Release|x64.Build.0 = Release|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186}.Release|x64.Build.0 = Release|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Debug|x64.Build.0 = Debug|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Release|x64.ActiveCfg = Release|Any CPU
+		{931B6ABB-1791-44F8-9727-4110FB59C961}.Release|x64.Build.0 = Release|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4}.Release|x64.Build.0 = Release|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Debug|x64.Build.0 = Debug|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Release|x64.ActiveCfg = Release|Any CPU
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3}.Release|x64.Build.0 = Release|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Debug|x64.Build.0 = Debug|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Release|x64.ActiveCfg = Release|Any CPU
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D}.Release|x64.Build.0 = Release|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Debug|x64.Build.0 = Debug|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Release|x64.ActiveCfg = Release|Any CPU
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33}.Release|x64.Build.0 = Release|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Debug|x64.Build.0 = Debug|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Release|x64.ActiveCfg = Release|Any CPU
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901}.Release|x64.Build.0 = Release|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Debug|x64.Build.0 = Debug|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Release|x64.ActiveCfg = Release|Any CPU
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D}.Release|x64.Build.0 = Release|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C}.Release|x64.Build.0 = Release|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Debug|x64.Build.0 = Debug|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Release|x64.ActiveCfg = Release|Any CPU
+		{57295D42-6C03-455B-8202-12AEAF233677}.Release|x64.Build.0 = Release|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9}.Release|x64.Build.0 = Release|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -480,5 +652,26 @@ Global
 		{72A20BA8-5FA6-4599-97B0-FB82F84DCDBA} = {D2CBE02E-6AA7-4343-9A01-891F971A17F5}
 		{622EBD86-43A5-4857-965C-1724F714012A} = {72A20BA8-5FA6-4599-97B0-FB82F84DCDBA}
 		{4B8BD204-FCED-4A4C-BD57-42B09B98745E} = {F347A85D-6FF5-4927-B5CF-54D81954E6A2}
+		{999D3649-47C8-4618-8870-1F423BF8E4FE} = {D2CBE02E-6AA7-4343-9A01-891F971A17F5}
+		{7CC3D72B-4518-4B78-BE48-630A263C0F5B} = {999D3649-47C8-4618-8870-1F423BF8E4FE}
+		{B65AC070-F56C-4C2C-9D0E-E76CEF7E8928} = {3BB5C2EE-694B-49F4-989F-8484FD0A3F75}
+		{268D8E32-75BB-4830-9D0E-3F70E1C75A5F} = {96063E26-CEF1-4763-90EF-81271231DB9F}
+		{097A482B-CD89-4BA9-939F-B232D35AF8E1} = {836F4115-EB6C-468A-AE65-6F123B0376E8}
+		{B2D57490-58A9-4F73-A34E-B4076713F712} = {AC21E230-C263-4FE0-8614-D6783D1FFC86}
+		{ADF3A6FF-9E94-400D-8A03-DE9C3A778186} = {049C2109-CF4F-4DD1-977D-92150C924E71}
+		{931B6ABB-1791-44F8-9727-4110FB59C961} = {18A4B060-7586-4321-806B-0325FAA01373}
+		{E2E3E9FC-15EB-4212-A6BD-A0D9590541E4} = {8AE5D37C-D340-4D66-8BAE-48A7ED60BCE8}
+		{EC2C5218-7C4E-4010-820B-8F2593E77AE3} = {DF1E54EE-B5F2-4911-B239-9708BF21F271}
+		{C6AED40E-22F8-49EC-AA3E-D9323E207A9D} = {66E8BB68-FF26-4FEE-A336-3F8284F2F3E2}
+		{F1585C81-8BFD-44D5-8601-C4A4CF5BEA33} = {6B260718-681F-41DB-AAFE-13BA15BB6711}
+		{3ECFDA25-B8AE-43F5-9CA9-4AFDF1F96901} = {641F22ED-9C6A-4ADA-A9E7-7CA6A67E39B1}
+		{EDD5B894-28C3-4FB5-8A85-AFD9C2FD823D} = {72A20BA8-5FA6-4599-97B0-FB82F84DCDBA}
+		{1E797ECB-D017-4ED6-8706-BC89B556F26C} = {65673857-6BDF-408E-ACD8-417A0BCCAB7A}
+		{57295D42-6C03-455B-8202-12AEAF233677} = {FE63FBCC-D03E-4439-A428-028A6FF8B15A}
+		{85F735B7-9BEE-43C3-94DF-539CE267F0B9} = {BE813EFD-133F-4BDE-AD25-A67D16A218CA}
+		{A4C73B2A-8F4A-48C5-BFEE-EA31B3DC34D3} = {F7F6C8C8-67C9-40D9-946F-62630C39102A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6822019A-56D3-4695-9B9E-96F9D10ECD75}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj b/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj
index 1ab9a24b2b..4a93d89d18 100644
--- a/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj
+++ b/src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Accounts.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Accounts.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,32 +88,32 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Accounts/Tests/app.config b/src/Feature/Accounts/Tests/app.config
index 077b6d1078..9c7b96f5ad 100644
--- a/src/Feature/Accounts/Tests/app.config
+++ b/src/Feature/Accounts/Tests/app.config
@@ -78,10 +78,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
-
        </assemblyBinding>
   
   </runtime>
diff --git a/src/Feature/Accounts/Tests/packages.config b/src/Feature/Accounts/Tests/packages.config
index 88f1460f79..839aa8b4ca 100644
--- a/src/Feature/Accounts/Tests/packages.config
+++ b/src/Feature/Accounts/Tests/packages.config
@@ -17,18 +17,18 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.Core.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.DataAccess.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Model.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.Outcome.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
   <package id="Sitecore.FakeDb.NSubstitute" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -38,9 +38,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Demo/tests/Properties/AssemblyInfo.cs b/src/Feature/Demo/tests/Properties/AssemblyInfo.cs
index c0f6a2ae42..8eb6654bd5 100644
--- a/src/Feature/Demo/tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Demo/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Feature.Accounts.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Accounts.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj b/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj
index f244791a83..cad8ff3b90 100644
--- a/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj
+++ b/src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Demo.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Demo.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -68,9 +68,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -85,38 +84,38 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
@@ -196,10 +195,10 @@
     <Compile Include="Services\BehaviorProfileDecoratorTests.cs" />
     <Compile Include="Services\ProfileProviderTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-      <Compile Include="..\..\..\ProductInfo.cs">
+    <Compile Include="..\..\..\ProductInfo.cs">
       <Link>Properties\ProductInfo.cs</Link>
     </Compile>
-</ItemGroup>
+  </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
       <SubType>Designer</SubType>
diff --git a/src/Feature/Demo/tests/app.config b/src/Feature/Demo/tests/app.config
index 18979e9d3d..3305c2ccd1 100644
--- a/src/Feature/Demo/tests/app.config
+++ b/src/Feature/Demo/tests/app.config
@@ -83,7 +83,7 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
         </assemblyBinding>
diff --git a/src/Feature/Demo/tests/packages.config b/src/Feature/Demo/tests/packages.config
index 06ee27c415..14b03ccbbf 100644
--- a/src/Feature/Demo/tests/packages.config
+++ b/src/Feature/Demo/tests/packages.config
@@ -17,20 +17,20 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.Core.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.DataAccess.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Model.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.Outcome.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
   <package id="Sitecore.FakeDb.NSubstitute" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Xdb.Configuration.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -40,9 +40,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Language/Tests/Properties/AssemblyInfo.cs b/src/Feature/Language/Tests/Properties/AssemblyInfo.cs
index 911659370e..4ea3ef848c 100644
--- a/src/Feature/Language/Tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Language/Tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Feature.Language.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Language.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj b/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj
index 79ca02f895..4a4b8546ed 100644
--- a/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj
+++ b/src/Feature/Language/Tests/Sitecore.Feature.Language.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Language.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Language.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,17 +88,17 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Language/Tests/app.config b/src/Feature/Language/Tests/app.config
index f608f4a11c..c9704959ff 100644
--- a/src/Feature/Language/Tests/app.config
+++ b/src/Feature/Language/Tests/app.config
@@ -75,10 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
        </assemblyBinding>
   
   </runtime>
diff --git a/src/Feature/Language/Tests/packages.config b/src/Feature/Language/Tests/packages.config
index c23dab6e36..64f093c4a4 100644
--- a/src/Feature/Language/Tests/packages.config
+++ b/src/Feature/Language/Tests/packages.config
@@ -17,13 +17,13 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Maps/tests/Properties/AssemblyInfo.cs b/src/Feature/Maps/tests/Properties/AssemblyInfo.cs
index 27512820ee..50afa76e6f 100644
--- a/src/Feature/Maps/tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Maps/tests/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Feature.Maps.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Maps.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +25,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj b/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj
index 2f768d50fe..6f64e96ef4 100644
--- a/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj
+++ b/src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Maps.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Maps.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -68,6 +68,9 @@
       <HintPath>..\..\..\..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
       <Private>True</Private>
@@ -76,10 +79,6 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Ploeh.AutoFixture, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.3.50.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
     </Reference>
@@ -89,23 +88,23 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Feature/Maps/tests/app.config b/src/Feature/Maps/tests/app.config
index f43a22c9df..0bad0d7877 100644
--- a/src/Feature/Maps/tests/app.config
+++ b/src/Feature/Maps/tests/app.config
@@ -75,10 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
         </assemblyBinding>
-
     </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Feature/Maps/tests/packages.config b/src/Feature/Maps/tests/packages.config
index e74d636d1c..8f94a845c3 100644
--- a/src/Feature/Maps/tests/packages.config
+++ b/src/Feature/Maps/tests/packages.config
@@ -17,15 +17,15 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -34,9 +34,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Media/Tests/Properties/AssemblyInfo.cs b/src/Feature/Media/Tests/Properties/AssemblyInfo.cs
index a16d484f1d..13faab44dc 100644
--- a/src/Feature/Media/Tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Media/Tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Feature.Media.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Media.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -34,7 +28,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
diff --git a/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj b/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj
index 76880631c4..527ffe46a5 100644
--- a/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj
+++ b/src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Media.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Media.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,20 +88,20 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Media/Tests/app.config b/src/Feature/Media/Tests/app.config
index 191a704190..dd3273710a 100644
--- a/src/Feature/Media/Tests/app.config
+++ b/src/Feature/Media/Tests/app.config
@@ -77,11 +77,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-  
-            </dependentAssembly>
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
+            </dependentAssembly> 
        </assemblyBinding>
-  
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Feature/Media/Tests/packages.config b/src/Feature/Media/Tests/packages.config
index fd9da7508c..7e072dc4ae 100644
--- a/src/Feature/Media/Tests/packages.config
+++ b/src/Feature/Media/Tests/packages.config
@@ -17,14 +17,14 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
   <package id="Sitecore.FakeDb.NSubstitute" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -34,9 +34,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Multisite/tests/App.config b/src/Feature/Multisite/tests/App.config
index f608f4a11c..c7b4dde2a2 100644
--- a/src/Feature/Multisite/tests/App.config
+++ b/src/Feature/Multisite/tests/App.config
@@ -75,11 +75,10 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
        </assemblyBinding>
   
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Feature/Multisite/tests/MultisiteControllerTests.cs b/src/Feature/Multisite/tests/MultisiteControllerTests.cs
index 2e68574cd0..6431521ca8 100644
--- a/src/Feature/Multisite/tests/MultisiteControllerTests.cs
+++ b/src/Feature/Multisite/tests/MultisiteControllerTests.cs
@@ -22,9 +22,9 @@ public void SwitchSite_ShouldReturnViewActionWithSiteDefinitionsModel([Frozen] I
 
     [Theory]
     [AutoDbData]
-    public void DefaultConstructor_ShouldNotThrow()
+    public void DefaultConstructor_ShouldNotThrow(ISiteConfigurationRepository repository)
     {
-      Action action = () => new MultisiteController();
+      Action action = () => new MultisiteController(repository);
       action.ShouldNotThrow();
     }
   }
diff --git a/src/Feature/Multisite/tests/Properties/AssemblyInfo.cs b/src/Feature/Multisite/tests/Properties/AssemblyInfo.cs
index e9983ce6ee..3caec7f893 100644
--- a/src/Feature/Multisite/tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Multisite/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Feature.Multisite.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Multisite.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj b/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj
index eceddab95f..1de64419d1 100644
--- a/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj
+++ b/src/Feature/Multisite/tests/Sitecore.Feature.Multisite.Tests.csproj
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Multisite.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Multisite.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -88,17 +88,17 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Multisite/tests/packages.config b/src/Feature/Multisite/tests/packages.config
index c23dab6e36..64f093c4a4 100644
--- a/src/Feature/Multisite/tests/packages.config
+++ b/src/Feature/Multisite/tests/packages.config
@@ -17,13 +17,13 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/News/Tests/Properties/AssemblyInfo.cs b/src/Feature/News/Tests/Properties/AssemblyInfo.cs
index 42c843811d..511d0a3c5b 100644
--- a/src/Feature/News/Tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/News/Tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Feature.News.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.News.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj b/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj
index 577a661ce3..31155dbb7e 100644
--- a/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj
+++ b/src/Feature/News/Tests/Sitecore.Feature.News.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.News.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.News.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,26 +88,26 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Feature/News/Tests/app.config b/src/Feature/News/Tests/app.config
index f608f4a11c..3139d003c2 100644
--- a/src/Feature/News/Tests/app.config
+++ b/src/Feature/News/Tests/app.config
@@ -75,11 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
        </assemblyBinding>
-  
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Feature/News/Tests/packages.config b/src/Feature/News/Tests/packages.config
index ccb4e02d40..e5dbb2aebc 100644
--- a/src/Feature/News/Tests/packages.config
+++ b/src/Feature/News/Tests/packages.config
@@ -17,16 +17,16 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -35,9 +35,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Person/tests/Properties/AssemblyInfo.cs b/src/Feature/Person/tests/Properties/AssemblyInfo.cs
index 72d9231ab0..4fce0c91ef 100644
--- a/src/Feature/Person/tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Person/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Feature.Person.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Person.Tests")]
-[assembly: AssemblyCopyright("Copyright © Sitecore 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj b/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj
index c17b67322a..5ba0b4c868 100644
--- a/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj
+++ b/src/Feature/Person/tests/Sitecore.Feature.Person.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Person.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Person.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,17 +88,17 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Person/tests/app.config b/src/Feature/Person/tests/app.config
index f608f4a11c..3139d003c2 100644
--- a/src/Feature/Person/tests/app.config
+++ b/src/Feature/Person/tests/app.config
@@ -75,11 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
        </assemblyBinding>
-  
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Feature/Person/tests/packages.config b/src/Feature/Person/tests/packages.config
index 4ddcc56fe4..c634b0d719 100644
--- a/src/Feature/Person/tests/packages.config
+++ b/src/Feature/Person/tests/packages.config
@@ -17,13 +17,13 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.ContentSearch.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Feature/Teasers/tests/App.config b/src/Feature/Teasers/tests/App.config
index 4e56b52a8b..a35e138b4f 100644
--- a/src/Feature/Teasers/tests/App.config
+++ b/src/Feature/Teasers/tests/App.config
@@ -75,11 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
-
         </assemblyBinding>
-
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Feature/Teasers/tests/Properties/AssemblyInfo.cs b/src/Feature/Teasers/tests/Properties/AssemblyInfo.cs
index 7eeeb94d86..49b5d3237e 100644
--- a/src/Feature/Teasers/tests/Properties/AssemblyInfo.cs
+++ b/src/Feature/Teasers/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Feature.Teasers.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Feature.Teasers.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj b/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj
index 74c6b5f787..f5d4919bb4 100644
--- a/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj
+++ b/src/Feature/Teasers/tests/Sitecore.Feature.Teasers.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Feature.Teasers.Tests</RootNamespace>
     <AssemblyName>Sitecore.Feature.Teasers.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -56,9 +56,8 @@
       <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -73,17 +72,17 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Feature/Teasers/tests/packages.config b/src/Feature/Teasers/tests/packages.config
index 44700ea2b0..2482e732d4 100644
--- a/src/Feature/Teasers/tests/packages.config
+++ b/src/Feature/Teasers/tests/packages.config
@@ -7,13 +7,13 @@
   <package id="Lucene.Net" version="3.0.3" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -23,9 +23,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Accounts/tests/Properties/AssemblyInfo.cs b/src/Foundation/Accounts/tests/Properties/AssemblyInfo.cs
index 37fc7f04ff..62840e0599 100644
--- a/src/Foundation/Accounts/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Accounts/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Foundation.SitecoreExtensions.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.SitecoreExtensions.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj b/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj
index a188ca91a1..b62e20cb00 100644
--- a/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj
+++ b/src/Foundation/Accounts/tests/Sitecore.Foundation.Accounts.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Accounts.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Accounts.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -92,41 +91,41 @@
     <Reference Include="Sitecore.Abstractions, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Abstractions.NoReferences.8.2.170614\lib\NET452\Sitecore.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch.Linq, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.Linq.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch.Linq, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/Accounts/tests/app.config b/src/Foundation/Accounts/tests/app.config
index 08653406fb..a35e138b4f 100644
--- a/src/Foundation/Accounts/tests/app.config
+++ b/src/Foundation/Accounts/tests/app.config
@@ -71,7 +71,13 @@
 
             </dependentAssembly>
 
-        </assemblyBinding>
+            <dependentAssembly>
+
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+
+            </dependentAssembly>
+        </assemblyBinding>
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Accounts/tests/packages.config b/src/Foundation/Accounts/tests/packages.config
index 24ccd19744..f4cc96b2b7 100644
--- a/src/Foundation/Accounts/tests/packages.config
+++ b/src/Foundation/Accounts/tests/packages.config
@@ -17,22 +17,22 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
   <package id="Sitecore.Abstractions.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Core.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.DataAccess.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Model.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.Outcome.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -41,9 +41,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Alerts/tests/Properties/AssemblyInfo.cs b/src/Foundation/Alerts/tests/Properties/AssemblyInfo.cs
index ae3e553b57..29087cdb96 100644
--- a/src/Foundation/Alerts/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Alerts/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Foundation.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj b/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj
index 8a8f249e29..250160af4b 100644
--- a/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj
+++ b/src/Foundation/Alerts/tests/Sitecore.Foundation.Alerts.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Alerts.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Alerts.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,20 +88,20 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/Alerts/tests/app.config b/src/Foundation/Alerts/tests/app.config
index 7514525273..a35e138b4f 100644
--- a/src/Foundation/Alerts/tests/app.config
+++ b/src/Foundation/Alerts/tests/app.config
@@ -75,10 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
         </assemblyBinding>
-
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Alerts/tests/packages.config b/src/Foundation/Alerts/tests/packages.config
index a8b2ef1dbb..3d2b30a4e4 100644
--- a/src/Foundation/Alerts/tests/packages.config
+++ b/src/Foundation/Alerts/tests/packages.config
@@ -17,14 +17,14 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Dictionary/tests/Properties/AssemblyInfo.cs b/src/Foundation/Dictionary/tests/Properties/AssemblyInfo.cs
index 8060ba2389..935c4c5ab6 100644
--- a/src/Foundation/Dictionary/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Dictionary/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Foundation.Dictionary.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Dictionary.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj b/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj
index 9a20482112..1fd2874e71 100644
--- a/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj
+++ b/src/Foundation/Dictionary/tests/Sitecore.Foundation.Dictionary.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Dictionary.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Dictionary.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -60,9 +60,8 @@
       <HintPath>..\..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -77,26 +76,26 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.FakeDb.NSubstitute, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.FakeDb.NSubstitute.1.7.0\lib\net45\Sitecore.FakeDb.NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/Dictionary/tests/app.config b/src/Foundation/Dictionary/tests/app.config
index 191a704190..1ae9e0b0bf 100644
--- a/src/Foundation/Dictionary/tests/app.config
+++ b/src/Foundation/Dictionary/tests/app.config
@@ -77,11 +77,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-  
-            </dependentAssembly>
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
+            </dependentAssembly> 
        </assemblyBinding>
-  
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Dictionary/tests/packages.config b/src/Foundation/Dictionary/tests/packages.config
index 5dbb916f13..11a67e5932 100644
--- a/src/Foundation/Dictionary/tests/packages.config
+++ b/src/Foundation/Dictionary/tests/packages.config
@@ -11,16 +11,16 @@
   <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
   <package id="Sitecore.FakeDb.NSubstitute" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -29,9 +29,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/FieldEditor/tests/Properties/AssemblyInfo.cs b/src/Foundation/FieldEditor/tests/Properties/AssemblyInfo.cs
index 159854379a..33c54f1385 100644
--- a/src/Foundation/FieldEditor/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/FieldEditor/tests/Properties/AssemblyInfo.cs
@@ -2,5 +2,4 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Sitecore.Foundation.FieldEditor")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj b/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj
index 79dad446b2..3d79a09009 100644
--- a/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj
+++ b/src/Foundation/FieldEditor/tests/Sitecore.Foundation.FieldEditor.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.FieldEditor.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.FieldEditor.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -60,9 +60,8 @@
       <HintPath>..\..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -80,17 +79,17 @@
     <Reference Include="Sitecore.Client, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Client.NoReferences.8.2.170614\lib\NET452\Sitecore.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ExperienceEditor, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ExperienceEditor.NoReferences.8.2.170614\lib\NET452\Sitecore.ExperienceEditor.dll</HintPath>
+    <Reference Include="Sitecore.ExperienceEditor, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ExperienceEditor.NoReferences.9.0.171219\lib\NET462\Sitecore.ExperienceEditor.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Foundation/FieldEditor/tests/app.config b/src/Foundation/FieldEditor/tests/app.config
index 7514525273..a35e138b4f 100644
--- a/src/Foundation/FieldEditor/tests/app.config
+++ b/src/Foundation/FieldEditor/tests/app.config
@@ -75,10 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
         </assemblyBinding>
-
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/FieldEditor/tests/packages.config b/src/Foundation/FieldEditor/tests/packages.config
index 2fab7df9bf..e5592d1d41 100644
--- a/src/Foundation/FieldEditor/tests/packages.config
+++ b/src/Foundation/FieldEditor/tests/packages.config
@@ -15,14 +15,14 @@
   <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
   <package id="Sitecore.Client.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ExperienceEditor.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.ExperienceEditor.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -32,9 +32,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Indexing/Tests/Properties/AssemblyInfo.cs b/src/Foundation/Indexing/Tests/Properties/AssemblyInfo.cs
index 5df6c7db44..30fd931d0e 100644
--- a/src/Foundation/Indexing/Tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Indexing/Tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Foundation.Indexing.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Indexing.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj b/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj
index 2a4e61f27f..5510680675 100644
--- a/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj
+++ b/src/Foundation/Indexing/Tests/Sitecore.Foundation.Indexing.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Indexing.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Indexing.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,29 +88,29 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Abstractions, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Abstractions.NoReferences.8.2.170614\lib\NET452\Sitecore.Abstractions.dll</HintPath>
+    <Reference Include="Sitecore.Abstractions, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Abstractions.NoReferences.9.0.171219\lib\NET462\Sitecore.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch.Linq, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.Linq.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch.Linq, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/Indexing/Tests/app.config b/src/Foundation/Indexing/Tests/app.config
index f608f4a11c..c54f8c8fdf 100644
--- a/src/Foundation/Indexing/Tests/app.config
+++ b/src/Foundation/Indexing/Tests/app.config
@@ -75,11 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-  
-            </dependentAssembly>
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
+            </dependentAssembly> 
        </assemblyBinding>
-  
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Indexing/Tests/packages.config b/src/Foundation/Indexing/Tests/packages.config
index e022ad78ec..77f4a9c003 100644
--- a/src/Foundation/Indexing/Tests/packages.config
+++ b/src/Foundation/Indexing/Tests/packages.config
@@ -17,17 +17,17 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Abstractions.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Abstractions.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -36,9 +36,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Installer/tests/MongoRestore/MongoRestoreProcessorTests.cs b/src/Foundation/Installer/tests/MongoRestore/MongoRestoreProcessorTests.cs
deleted file mode 100644
index e9cb470346..0000000000
--- a/src/Foundation/Installer/tests/MongoRestore/MongoRestoreProcessorTests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace Sitecore.Foundation.Installer.Tests.MongoRestore
-{
-  using NSubstitute;
-  using Ploeh.AutoFixture.Xunit2;
-  using Sitecore.Foundation.Installer.MongoRestore;
-  using Sitecore.Foundation.Testing.Attributes;
-  using Xunit;
-
-  public class MongoRestoreProcessorTests
-  {
-    [Theory]
-    [AutoDbData]
-    public void Process_IsRestored_DontRestore([Frozen] IMongoRestoreService mongoRestoreService, [Greedy] MongoRestoreProcessor sut )
-    {
-      //Arrange
-      mongoRestoreService.IsRestored(Arg.Is("analytics")).Returns(true);
-      //Act
-      sut.Process(null);
-      //Assert      
-      mongoRestoreService.DidNotReceive().RestoreDatabases();
-    }
-
-
-    [Theory]
-    [AutoDbData]
-    public void Process_IsRestored_DontRebuildIndex([Frozen] IMongoRestoreService mongoRestoreService, [Greedy] MongoRestoreProcessor sut)
-    {
-      //Arrange
-      mongoRestoreService.IsRestored(Arg.Is("analytics")).Returns(true);
-      //Act
-      sut.Process(null);
-      //Assert      
-      mongoRestoreService.DidNotReceive().StartRebuildAnalyticsIndexJob();
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void Process_IsNotRestored_Restore([Frozen] IMongoRestoreService mongoRestoreService, [Greedy] MongoRestoreProcessor sut)
-    {
-      //Arrange
-      mongoRestoreService.IsRestored(Arg.Is("analytics")).Returns(false);
-      //Act
-      sut.Process(null);
-      //Assert      
-      mongoRestoreService.Received().RestoreDatabases();
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void Process_IsNotRestored_RebuildIndex([Frozen] IMongoRestoreService mongoRestoreService, [Greedy] MongoRestoreProcessor sut)
-    {
-      //Arrange
-      mongoRestoreService.IsRestored(Arg.Is("analytics")).Returns(false);
-      //Act
-      sut.Process(null);
-      //Assert      
-      mongoRestoreService.Received().StartRebuildAnalyticsIndexJob();
-    }
-  }
-}
diff --git a/src/Foundation/Installer/tests/MongoRestore/MongoRestoreServiceTests.cs b/src/Foundation/Installer/tests/MongoRestore/MongoRestoreServiceTests.cs
deleted file mode 100644
index 8a7872cc97..0000000000
--- a/src/Foundation/Installer/tests/MongoRestore/MongoRestoreServiceTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-namespace Sitecore.Foundation.Installer.Tests.MongoRestore
-{
-  using System;
-  using System.Collections.Generic;
-  using System.Linq;
-  using FluentAssertions;
-  using log4net.Appender;
-  using log4net.Config;
-  using log4net.spi;
-  using NSubstitute;
-  using Ploeh.AutoFixture.Xunit2;
-  using Sitecore.Foundation.Installer.MongoRestore;
-  using Sitecore.Foundation.Testing.Attributes;
-  using Xunit;
-
-  public class MongoRestoreServiceTests
-  {
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_NoConnection_LogAnError(MemoryAppender appender, MongoRestoreService sut)
-    {
-      //Arrange
-      BasicConfigurator.Configure(appender);
-      //Act
-      sut.RestoreDatabase("wrongConnnection");
-      //Assert      
-      appender.Events.Should().Contain(x => x.Level == Level.ERROR);
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_NotMongoConnection_LogAnError(MemoryAppender appender, MongoRestoreService sut)
-    {
-      //Arrange
-      BasicConfigurator.Configure(appender);
-      //Act
-      sut.RestoreDatabase("sql");
-      //Assert      
-      appender.Events.Should().Contain(x => x.Level == Level.ERROR);
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_NoConnection_DontCallRestore([Frozen]IProcessRunner processRunner, [Greedy]MongoRestoreService sut)
-    {
-      //Act
-      sut.RestoreDatabase("wrongConnnection");
-      //Assert      
-      processRunner.DidNotReceive().Run(Arg.Any<string>(), Arg.Any<string>());
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_NotMongoConnection_DontCallRestore([Frozen]IProcessRunner processRunner, [Greedy]MongoRestoreService sut)
-    {
-      //Act
-      sut.RestoreDatabase("sql");
-      //Assert      
-      processRunner.DidNotReceive().Run(Arg.Any<string>(), Arg.Any<string>());
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_MongoConnection_RunRestoreProcessFile(
-      string mongoRestorePath,
-      [Frozen]IMongoPathsProvider mongoPathsProvider,
-      [Frozen]IProcessRunner processRunner,
-      [Greedy]MongoRestoreService sut)
-    {
-      //Arrange
-      mongoPathsProvider.MongoRestoreExe.Returns(mongoRestorePath);
-      //Act
-      sut.RestoreDatabase("analytics");
-      //Assert      
-      processRunner.Received(1).Run(mongoPathsProvider.MongoRestoreExe, Arg.Any<string>());
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabase_MongoConnection_RunRestoreWithArguments(
-      string dumpDirectory,
-      [Frozen]IMongoPathsProvider mongoPathsProvider,
-      [Frozen]IProcessRunner processRunner,
-      [Greedy]MongoRestoreService sut)
-    {
-      //Arrange
-      mongoPathsProvider.GetDumpDirectory(Arg.Is("analytics")).Returns(dumpDirectory);
-      //Act
-      sut.RestoreDatabase("analytics");
-      //Assert      
-      processRunner.Received(1).Run(Arg.Any<string>(), Arg.Is<string>(x => x.Contains("--host localhost:27017") && x.Contains("--db habitat_local_analytics") && x.Contains("--dir ")));
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void RestoreDatabases_Call_RestoreAllDumps(
-      [Frozen]IMongoPathsProvider mongoPathsProvider,
-      [Frozen]IProcessRunner processRunner,
-      [Greedy]MongoRestoreService sut
-      )
-    {
-      //Arrange
-      var dumpNames = new List<string>() { "analytics", "tracking.live", "tracking.history", "tracking.contact" };
-      var dbNames = new List<string>() { "habitat_local_analytics", "habitat_local_tracking_live", "habitat_local_tracking_history", "habitat_local_tracking_contact" };
-      mongoPathsProvider.GetDumpNames().Returns(dumpNames);
-      
-      //Act
-      sut.RestoreDatabases();
-      //Assert
-      dbNames.ForEach(db=>processRunner.Received().Run(Arg.Any<string>(),Arg.Is<string>(arg=>arg.Contains($"--db {db}"))));
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void IsRstored_NoConnection_ReturnFalse(
-      [Frozen]IMongoPathsProvider mongoPathsProvider,
-      [Frozen]IProcessRunner processRunner,
-      [Greedy]MongoRestoreService sut)
-    {
-      sut.IsRestored("wrongConnection").Should().BeFalse();
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void IsRstored_NotMongoConnection_ReturnFalse(
-      [Frozen]IMongoPathsProvider mongoPathsProvider,
-      [Frozen]IProcessRunner processRunner,
-      [Greedy]MongoRestoreService sut)
-    {
-      sut.Invoking(x => x.IsRestored("sql")).ShouldThrow<FormatException>();
-    }
-  }
-}
diff --git a/src/Foundation/Installer/tests/Properties/AssemblyInfo.cs b/src/Foundation/Installer/tests/Properties/AssemblyInfo.cs
index ee78cc4533..80e8ec7fcd 100644
--- a/src/Foundation/Installer/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Installer/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Foundation.Installer.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Installer..Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj b/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj
index a8d641eff0..aa53af2af8 100644
--- a/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj
+++ b/src/Foundation/Installer/tests/Sitecore.Foundation.Installer.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Installer.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Installer.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -65,6 +65,9 @@
       <HintPath>..\..\..\..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
       <Private>True</Private>
@@ -73,10 +76,6 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Ploeh.AutoFixture, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.3.50.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
     </Reference>
@@ -86,14 +85,14 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
@@ -161,8 +160,6 @@
   <ItemGroup>
     <Compile Include="AccountsEnableActionTests.cs" />
     <Compile Include="AutoSububstituteDataAttribute.cs" />
-    <Compile Include="MongoRestore\MongoRestoreProcessorTests.cs" />
-    <Compile Include="MongoRestore\MongoRestoreServiceTests.cs" />
     <Compile Include="PostStepTests.cs" />
     <Compile Include="XmlTransformActionTests.cs" />
     <Compile Include="ProcessRunnerTests.cs" />
diff --git a/src/Foundation/Installer/tests/TransformsProviderTests.cs b/src/Foundation/Installer/tests/TransformsProviderTests.cs
index 87a5fcb033..5034b2f75b 100644
--- a/src/Foundation/Installer/tests/TransformsProviderTests.cs
+++ b/src/Foundation/Installer/tests/TransformsProviderTests.cs
@@ -24,7 +24,7 @@ public void GetTransformsByLayer_ShouldReturnsTransformsList([Frozen]IFilePathRe
       Directory.CreateDirectory("temp");
       Directory.CreateDirectory(transformsPath);
       Directory.CreateDirectory($"{transformsPath}/{layerName}");
-      var transformFilePath = $"{transformsPath}\\{layerName}\\{transformFileName}.transform";
+      var transformFilePath = $"{transformsPath}\\{layerName}\\{transformFileName}.xdt";
       File.CreateText(transformFilePath);
       var transforms = provider.GetTransformsByLayer(layerName);
       transforms.Should().Contain(new List<string>() { transformFilePath });
diff --git a/src/Foundation/Installer/tests/app.config b/src/Foundation/Installer/tests/app.config
index b77a9cf382..b75fb7f04c 100644
--- a/src/Foundation/Installer/tests/app.config
+++ b/src/Foundation/Installer/tests/app.config
@@ -82,11 +82,11 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
   
        </assemblyBinding>
   
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Installer/tests/packages.config b/src/Foundation/Installer/tests/packages.config
index 524fa80f3b..81bfaef5f9 100644
--- a/src/Foundation/Installer/tests/packages.config
+++ b/src/Foundation/Installer/tests/packages.config
@@ -17,12 +17,12 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -32,9 +32,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/LocalDatasource/tests/App.config b/src/Foundation/LocalDatasource/tests/App.config
index 4e56b52a8b..a35e138b4f 100644
--- a/src/Foundation/LocalDatasource/tests/App.config
+++ b/src/Foundation/LocalDatasource/tests/App.config
@@ -75,11 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
-
         </assemblyBinding>
-
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj b/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj
index 4e272375d0..3c23a0fd09 100644
--- a/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj
+++ b/src/Foundation/LocalDatasource/tests/Sitecore.Foundation.LocalDatasource.Tests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.LocalDatasource.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.LocalDatasource.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,9 +57,8 @@
       <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -73,14 +73,14 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Foundation/LocalDatasource/tests/packages.config b/src/Foundation/LocalDatasource/tests/packages.config
index 4effc7f5c2..29d82287f6 100644
--- a/src/Foundation/LocalDatasource/tests/packages.config
+++ b/src/Foundation/LocalDatasource/tests/packages.config
@@ -7,12 +7,12 @@
   <package id="Lucene.Net" version="3.0.3" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net46" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -22,9 +22,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Multisite/tests/App.config b/src/Foundation/Multisite/tests/App.config
index f608f4a11c..3139d003c2 100644
--- a/src/Foundation/Multisite/tests/App.config
+++ b/src/Foundation/Multisite/tests/App.config
@@ -75,11 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
        </assemblyBinding>
-  
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Multisite/tests/Properties/AssemblyInfo.cs b/src/Foundation/Multisite/tests/Properties/AssemblyInfo.cs
index 13c3f6b2ba..6393cb7c0e 100644
--- a/src/Foundation/Multisite/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Multisite/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Foundation.Multisite.Tets")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Multisite.Tets")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Foundation/Multisite/tests/SiteDefinitionProviderTests.cs b/src/Foundation/Multisite/tests/SiteDefinitionProviderTests.cs
index 08b2dcee2e..9377e73b97 100644
--- a/src/Foundation/Multisite/tests/SiteDefinitionProviderTests.cs
+++ b/src/Foundation/Multisite/tests/SiteDefinitionProviderTests.cs
@@ -15,8 +15,11 @@
   using Sitecore.Sites;
   using Sitecore.Web;
   using Xunit;
+  using Moq;
+  using NSubstitute;
+  using Sitecore.Abstractions;
 
-  public class SiteDefinitionProviderTests
+    public class SiteDefinitionProviderTests
   {
     [Theory]
     [AutoDbData]
@@ -32,7 +35,9 @@ public void SiteDefinitions_InvalidSiteRoot_ShouldReturnEmpty(Db db, string site
                            {"database", db.Database.Name},
                          };
       var site = new SiteInfo(siteSettings);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new SiteInfo[] { site });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() {site});
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       provider.SiteDefinitions.Should().BeEmpty();
     }
@@ -55,7 +60,9 @@ public void GetContextSiteDefinition_ContextItemOutsideHierarchy_ShouldReturnIsC
                          };
 
       var site = new SiteInfo(siteSettings);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new SiteInfo[] { site });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { site });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var currentContext = new SiteContext(site);
       using (new SiteContextSwitcher(currentContext))
@@ -70,7 +77,9 @@ public void GetContextSiteDefinition_ContextItemOutsideHierarchy_ShouldReturnIsC
     public void SiteDefinitions_HostnameSetToInvalidHost_ShouldThrowConfigurationError(Db db, string siteName, DbItem rootItem)
     {
       var currentSite = SetupSite(db, siteName, rootItem, null, "*.test.com");
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new[] { currentSite });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { currentSite });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var context = new SiteContext(currentSite);
       using (new SiteContextSwitcher(context))
@@ -86,7 +95,9 @@ public void SiteDefinitions_TargetHostnameNotSet_ShouldReturnHostName(Db db, str
     {
       const string siteHostName = "www.test.com";
       var currentSite = SetupSite(db, siteName, rootItem, null, siteHostName);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new[] { currentSite });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { currentSite });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var context = new SiteContext(currentSite);
       using (new SiteContextSwitcher(context))
@@ -101,7 +112,9 @@ public void SiteDefinitions_TargetHostnameNotSet_ShouldReturnHostName(Db db, str
     public void SiteDefinitions_TargetHostnameSet_ShouldReturnTargetHostName(Db db, string siteName, DbItem rootItem, string targetHostName)
     {
       var currentSite = SetupSite(db, siteName, rootItem, targetHostName);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new[] { currentSite });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { currentSite });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var context = new SiteContext(currentSite);
       using (new SiteContextSwitcher(context))
@@ -136,7 +149,9 @@ private static SiteInfo SetupSite(Db db, string siteName, DbItem rootItem, strin
     public void SiteDefinitions_NoHostnameSet_ShouldThrow(Db db, string siteName, string hostName, DbItem rootItem)
     {
       var currentSite = SetupSite(db, siteName, rootItem, null, null);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new[] { currentSite });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { currentSite });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var context = new SiteContext(currentSite);
       using (new SiteContextSwitcher(context))
@@ -172,7 +187,9 @@ public void GetContextSiteDefinition_ContextItemInsideHierarchy_ShouldReturnHier
                            {"database", db.Database.Name}
                          };
       var currentSite = new SiteInfo(currentSiteSettings);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new[] { hierarchicalSite, currentSite });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { hierarchicalSite, currentSite });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       var context = new SiteContext(currentSite);
       using (new SiteContextSwitcher(context))
@@ -198,7 +215,9 @@ public void SiteDefinitions_ValidSiteRoot_ShouldReturnSiteDefinition(Db db, stri
                            {"database", db.Database.Name}
                          };
       var site = new SiteInfo(siteSettings);
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new SiteInfo[] { site });
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>() { site });
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       provider.SiteDefinitions.Should().Contain(d => d.Name == siteName);
     }
@@ -207,7 +226,9 @@ public void SiteDefinitions_ValidSiteRoot_ShouldReturnSiteDefinition(Db db, stri
     [AutoDbData]
     public void SiteDefinitions_NoSites_ShouldReturnEmpty()
     {
-      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(new SiteInfo[] {});
+      var siteFactory = new Mock<BaseSiteContextFactory>();
+      siteFactory.Setup(x => x.GetSites()).Returns(new List<SiteInfo>());
+      ISiteDefinitionsProvider provider = new SiteDefinitionsProvider(siteFactory.Object);
 
       provider.SiteDefinitions.Should().BeEmpty();
     }
diff --git a/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj b/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj
index d3d433d226..7bf19c4517 100644
--- a/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj
+++ b/src/Foundation/Multisite/tests/Sitecore.Foundation.Multisite.Tests.csproj
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Multisite.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Multisite.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -88,17 +88,17 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
diff --git a/src/Foundation/Multisite/tests/packages.config b/src/Foundation/Multisite/tests/packages.config
index c23dab6e36..64f093c4a4 100644
--- a/src/Foundation/Multisite/tests/packages.config
+++ b/src/Foundation/Multisite/tests/packages.config
@@ -17,13 +17,13 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/SitecoreExtensions/Tests/Properties/AssemblyInfo.cs b/src/Foundation/SitecoreExtensions/Tests/Properties/AssemblyInfo.cs
index 37fc7f04ff..62840e0599 100644
--- a/src/Foundation/SitecoreExtensions/Tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/SitecoreExtensions/Tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Sitecore.Foundation.SitecoreExtensions.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.SitecoreExtensions.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Foundation/SitecoreExtensions/Tests/Services/TrackerServiceTests.cs b/src/Foundation/SitecoreExtensions/Tests/Services/TrackerServiceTests.cs
index 00d7c9e8d7..555afb47ca 100644
--- a/src/Foundation/SitecoreExtensions/Tests/Services/TrackerServiceTests.cs
+++ b/src/Foundation/SitecoreExtensions/Tests/Services/TrackerServiceTests.cs
@@ -7,7 +7,7 @@
   using Ploeh.AutoFixture.AutoNSubstitute;
   using Ploeh.AutoFixture.Xunit2;
   using Sitecore.Analytics;
-  using Sitecore.Analytics.Data.Items;
+  using Sitecore.Analytics.Data;
   using Sitecore.Analytics.Tracking;
   using Sitecore.Analytics.Outcome.Extensions;
   using Sitecore.Data;
@@ -15,6 +15,7 @@
   using Sitecore.FakeDb.AutoFixture;
   using Sitecore.Foundation.SitecoreExtensions.Services;
   using Sitecore.Foundation.Testing.Attributes;
+  using Sitecore.Marketing.Definitions;
   using Xunit;
 
   public class TrackerServiceTests
@@ -25,22 +26,16 @@ public void TrackPageEvent_ValidID_ShouldTrackById(Database db, [Content] Item i
       tracker.IsActive.Returns(true);
       using (new TrackerSwitcher(tracker))
       {
-        trackerService.TrackPageEvent(item.ID);
-        tracker.CurrentPage.Received(1).Register(Arg.Is<PageEventItem>(x => x.ID == item.ID));
+        trackerService.TrackPageEvent(item.ID.ToGuid());
+        tracker.CurrentPage.Received(1).Register(Arg.Is<PageEventData>(x => x.ItemId == item.ID.ToGuid()));
       }
     }
 
-    [Theory, AutoDbData]
-    public void TrackPageEvent_NullEvent_ShouldThrowArgumentException(TrackerService trackerService)
-    {
-      trackerService.Invoking(x => x.TrackPageEvent(null)).ShouldThrow<ArgumentNullException>();
-    }
-
     [Theory, AutoDbData]
     public void TrackPageEvent_NullTracker_ShouldNotTrackEvent(Database db, [Content] Item item, ITracker tracker, TrackerService trackerService)
     {
-      trackerService.TrackPageEvent(item.ID);
-      tracker.CurrentPage.DidNotReceive().Register(Arg.Is<PageEventItem>(x => x.ID == item.ID));
+      trackerService.TrackPageEvent(item.ID.ToGuid());
+      tracker.CurrentPage.DidNotReceive().Register(Arg.Is<PageEventData>(x => x.ItemId == item.ID.ToGuid()));
     }
 
     [Theory, AutoDbData]
@@ -48,32 +43,21 @@ public void TrackPageEvent_InActiveTracker_ShouldNotTrack(Database db, [Content]
     {
       using (new TrackerSwitcher(tracker))
       {
-        trackerService.TrackPageEvent(item.ID);
-        tracker.CurrentPage.DidNotReceive().Register(Arg.Is<PageEventItem>(x => x.ID == item.ID));
+        trackerService.TrackPageEvent(item.ID.ToGuid());
+        tracker.CurrentPage.DidNotReceive().Register(Arg.Is<PageEventData>(x => x.ItemId == item.ID.ToGuid()));
       }
     }
 
     [Theory]
     [AutoDbData]
-    public void IdentifyContact_ValidIdentifier_ShouldIdentifyContact([NoAutoProperties] TrackerService trackerService, string contactIdentifier, ITracker tracker, [Substitute] Session session)
+    public void IdentifyContact_ValidIdentifier_ShouldIdentifyContact([NoAutoProperties] TrackerService trackerService, string contactSource, string contactIdentifier, ITracker tracker, [Substitute] Session session)
     {
       tracker.IsActive.Returns(true);
       tracker.Session.Returns(session);
       using (new TrackerSwitcher(tracker))
       {
-        trackerService.IdentifyContact(contactIdentifier);
-        tracker.Session.Received().Identify(contactIdentifier);
-      }
-    }
-
-    [Theory]
-    [AutoDbData]
-    public void TrackOutcome_NullOutcomeId_ThrowException([NoAutoProperties] TrackerService trackerService, ITracker tracker)
-    {
-      tracker.IsActive.Returns(true);
-      using (new TrackerSwitcher(tracker))
-      {
-        trackerService.Invoking(x => x.TrackOutcome(null)).ShouldThrow<ArgumentNullException>();
+        trackerService.IdentifyContact(contactSource, contactIdentifier);
+        tracker.Session.Received().IdentifyAs(contactSource, contactIdentifier);
       }
     }
 
@@ -89,7 +73,7 @@ public void TrackOutcome_ValidOutcome_ShouldRegisterOutcome([Frozen]ID outcomeDe
 
       using (new TrackerSwitcher(tracker))
       {
-        trackerService.TrackOutcome(outcomeDefinitionId);
+        trackerService.TrackOutcome(outcomeDefinitionId.ToGuid());
 
         tracker.GetContactOutcomes().Should().Contain(o => o.DefinitionId == outcomeDefinitionId);
       }
@@ -107,7 +91,7 @@ public void TrackOutcome_InactiveTracker_ShouldNotTrack([Frozen]ID outcomeDefini
       using (new TrackerSwitcher(tracker))
       {
         // Act
-        trackerService.TrackOutcome(outcomeDefinitionId);
+        trackerService.TrackOutcome(outcomeDefinitionId.ToGuid());
 
         // Assert
         tracker.GetContactOutcomes().Should().BeEmpty();
diff --git a/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj b/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj
index 6b6c0b92ed..cea4849332 100644
--- a/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj
+++ b/src/Foundation/SitecoreExtensions/Tests/Sitecore.Foundation.SitecoreExtensions.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.SitecoreExtensions.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.SitecoreExtensions.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -72,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -89,44 +88,50 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Abstractions, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Abstractions.NoReferences.8.2.170614\lib\NET452\Sitecore.Abstractions.dll</HintPath>
+    <Reference Include="Sitecore.Abstractions, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Abstractions.NoReferences.9.0.171219\lib\NET462\Sitecore.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Analytics, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Core.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Core, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.DataAccess, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.DataAccess.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.DataAccess, Version=11.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.DataAccess.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Model.dll</HintPath>
+    <Reference Include="Sitecore.Analytics.Model, Version=11.40.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Analytics.Model.NoReferences.9.0.171219\lib\NET462\Sitecore.Analytics.Model.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Analytics.Outcome, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Analytics.Outcome.NoReferences.8.2.170614\lib\NET452\Sitecore.Analytics.Outcome.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.ContentSearch.Linq, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.8.2.170614\lib\NET452\Sitecore.ContentSearch.Linq.dll</HintPath>
+    <Reference Include="Sitecore.ContentSearch.Linq, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.ContentSearch.Linq.NoReferences.9.0.171219\lib\NET462\Sitecore.ContentSearch.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Marketing.Core, Version=12.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Marketing.Core.NoReferences.9.0.171219\lib\NET462\Sitecore.Marketing.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Sitecore.Marketing.xMgmt, Version=12.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Marketing.xMgmt.NoReferences.9.0.171219\lib\NET462\Sitecore.Marketing.xMgmt.dll</HintPath>
+    </Reference>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/SitecoreExtensions/Tests/app.config b/src/Foundation/SitecoreExtensions/Tests/app.config
index f608f4a11c..7252be7d1f 100644
--- a/src/Foundation/SitecoreExtensions/Tests/app.config
+++ b/src/Foundation/SitecoreExtensions/Tests/app.config
@@ -75,11 +75,9 @@
   
                  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
   
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                 <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
   
             </dependentAssembly>
-  
-       </assemblyBinding>
-  
+  </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/SitecoreExtensions/Tests/packages.config b/src/Foundation/SitecoreExtensions/Tests/packages.config
index 24ccd19744..e79781b14c 100644
--- a/src/Foundation/SitecoreExtensions/Tests/packages.config
+++ b/src/Foundation/SitecoreExtensions/Tests/packages.config
@@ -17,22 +17,24 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.Abstractions.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Core.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.DataAccess.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Analytics.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Abstractions.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.DataAccess.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.Model.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Analytics.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Analytics.Outcome.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.ContentSearch.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.Linq.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.ContentSearch.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Marketing.Core.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Marketing.xMgmt.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -41,9 +43,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
diff --git a/src/Foundation/Testing/tests/Properties/AssemblyInfo.cs b/src/Foundation/Testing/tests/Properties/AssemblyInfo.cs
index 143fc80cbc..aa25f8a08f 100644
--- a/src/Foundation/Testing/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Testing/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 
 [assembly: AssemblyTitle("Common.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Common.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -35,5 +29,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Foundation/Testing/tests/Sitecore.Foundation.Testing.csproj b/src/Foundation/Testing/tests/Sitecore.Foundation.Testing.csproj
index 0ea427fba6..a1c7479df2 100644
--- a/src/Foundation/Testing/tests/Sitecore.Foundation.Testing.csproj
+++ b/src/Foundation/Testing/tests/Sitecore.Foundation.Testing.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -38,13 +38,11 @@
       <HintPath>..\..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\FluentAssertions.4.18.0\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions, Version=4.19.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\FluentAssertions.4.18.0\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions.Core, Version=4.19.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -79,22 +77,25 @@
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture, Version=3.50.2.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AutoFixture.3.50.2\lib\net40\Ploeh.AutoFixture.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Ploeh.AutoFixture, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\AutoFixture.3.50.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture.AutoNSubstitute, Version=3.50.2.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AutoFixture.AutoNSubstitute.3.50.2\lib\net40\Ploeh.AutoFixture.AutoNSubstitute.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Ploeh.AutoFixture.AutoNSubstitute, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\AutoFixture.AutoNSubstitute.3.50.3\lib\net40\Ploeh.AutoFixture.AutoNSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.2.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.2\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.ContentSearch, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\Sitecore\Sitecore.ContentSearch.dll</HintPath>
     </Reference>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    </Reference>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    </Reference>
     <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\Sitecore\Sitecore.Kernel.dll</HintPath>
@@ -157,20 +158,17 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -193,7 +191,9 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="web.config" />
+    <None Include="web.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
@@ -202,6 +202,12 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
+  </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">
diff --git a/src/Foundation/Testing/tests/packages.config b/src/Foundation/Testing/tests/packages.config
index 78feb086cc..1f75493b35 100644
--- a/src/Foundation/Testing/tests/packages.config
+++ b/src/Foundation/Testing/tests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoFixture" version="3.50.2" targetFramework="net46" />
-  <package id="AutoFixture.AutoNSubstitute" version="3.50.2" targetFramework="net46" />
-  <package id="AutoFixture.Xunit2" version="3.50.2" targetFramework="net46" />
+  <package id="AutoFixture" version="3.50.3" targetFramework="net462" />
+  <package id="AutoFixture.AutoNSubstitute" version="3.50.3" targetFramework="net462" />
+  <package id="AutoFixture.Xunit2" version="3.50.3" targetFramework="net462" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net46" />
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net46" />
+  <package id="FluentAssertions" version="4.19.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net46" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
@@ -20,11 +20,13 @@
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
-  <package id="xunit" version="2.1.0" targetFramework="net46" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net46" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net46" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net46" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net46" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net46" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="xunit" version="2.2.0" targetFramework="net462" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net462" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net462" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/src/Foundation/Theming/tests/App.config b/src/Foundation/Theming/tests/App.config
index 7514525273..a35e138b4f 100644
--- a/src/Foundation/Theming/tests/App.config
+++ b/src/Foundation/Theming/tests/App.config
@@ -75,10 +75,9 @@
 
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
 
             </dependentAssembly>
         </assemblyBinding>
-
     </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Foundation/Theming/tests/Properties/AssemblyInfo.cs b/src/Foundation/Theming/tests/Properties/AssemblyInfo.cs
index f9006a5ae0..d64adaedbe 100644
--- a/src/Foundation/Theming/tests/Properties/AssemblyInfo.cs
+++ b/src/Foundation/Theming/tests/Properties/AssemblyInfo.cs
@@ -7,12 +7,6 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("Sitecore.Foundation.Theming.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sitecore.Foundation.Theming.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +26,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj b/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj
index d0d4249753..51d6aeb379 100644
--- a/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj
+++ b/src/Foundation/Theming/tests/Sitecore.Foundation.Theming.Tests.csproj
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Foundation.Theming.Tests</RootNamespace>
     <AssemblyName>Sitecore.Foundation.Theming.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,9 +72,8 @@
       <HintPath>..\..\..\..\packages\netDumbster.1.3.0.7\lib\net40\netDumbster.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
@@ -88,20 +88,20 @@
     <Reference Include="Ploeh.AutoFixture.Xunit2, Version=3.50.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\AutoFixture.Xunit2.3.50.3\lib\net45\Ploeh.AutoFixture.Xunit2.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.0\lib\net45\Sitecore.FakeDb.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.1.7.2\lib\net45\Sitecore.FakeDb.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.0\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
+    <Reference Include="Sitecore.FakeDb.AutoFixture, Version=1.7.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.FakeDb.AutoFixture.1.7.2\lib\net45\Sitecore.FakeDb.AutoFixture.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.8.2.170614\lib\NET452\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=11.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Logging, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Logging.NoReferences.8.2.170614\lib\NET452\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.8.2.170614\lib\NET452\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Sitecore.Nexus, Version=1.0.4425.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Sitecore.Nexus.NoReferences.8.2.170614\lib\NET452\Sitecore.Nexus.dll</HintPath>
diff --git a/src/Foundation/Theming/tests/packages.config b/src/Foundation/Theming/tests/packages.config
index a8b2ef1dbb..3d2b30a4e4 100644
--- a/src/Foundation/Theming/tests/packages.config
+++ b/src/Foundation/Theming/tests/packages.config
@@ -17,14 +17,14 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Moq" version="4.5.30" targetFramework="net46" />
   <package id="netDumbster" version="1.3.0.7" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net46" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.0" targetFramework="net46" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.FakeDb" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.FakeDb.AutoFixture" version="1.7.2" targetFramework="net462" />
+  <package id="Sitecore.Kernel.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Logging.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
-  <package id="Sitecore.Mvc.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
+  <package id="Sitecore.Mvc.NoReferences" version="9.0.171219" targetFramework="net462" developmentDependency="true" />
   <package id="Sitecore.Nexus.NoReferences" version="8.2.170614" targetFramework="net46" developmentDependency="true" />
   <package id="System.Collections" version="4.0.11" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net46" />
@@ -33,9 +33,9 @@
   <package id="System.Globalization" version="4.0.11" targetFramework="net46" />
   <package id="System.Linq" version="4.1.0" targetFramework="net46" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net46" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net46" requireReinstallation="true" />
   <package id="System.Threading" version="4.0.11" targetFramework="net46" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />