diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
index bb9052124..21bd20a45 100644
--- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
@@ -45,6 +45,10 @@
..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll
+
+ False
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+
@@ -55,9 +59,6 @@
..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NUnit.2.6.2\lib\nunit.framework.dll
diff --git a/src/NzbDrone.Api.Test/packages.config b/src/NzbDrone.Api.Test/packages.config
index 492cf9b49..1b31d36dc 100644
--- a/src/NzbDrone.Api.Test/packages.config
+++ b/src/NzbDrone.Api.Test/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
index 187b9539f..07aaeb7a0 100644
--- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
+++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
@@ -44,6 +44,10 @@
..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll
+
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+ True
+
@@ -52,9 +56,6 @@
..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NLog.2.1.0\lib\net40\NLog.dll
diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config
index ae445db35..ee6fb9de9 100644
--- a/src/NzbDrone.App.Test/packages.config
+++ b/src/NzbDrone.App.Test/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
index 4135a24d3..a7af6a347 100644
--- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -44,6 +44,11 @@
..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll
+
+ False
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+ True
+
@@ -52,9 +57,6 @@
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NLog.2.1.0\lib\net40\NLog.dll
diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config
index 7f9f6fc6e..21d439b29 100644
--- a/src/NzbDrone.Common.Test/packages.config
+++ b/src/NzbDrone.Common.Test/packages.config
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/src/NzbDrone.Core.Test/License.txt b/src/NzbDrone.Core.Test/License.txt
new file mode 100644
index 000000000..5ead6991a
--- /dev/null
+++ b/src/NzbDrone.Core.Test/License.txt
@@ -0,0 +1,22 @@
+ Copyright (c) 2010 Darren Cauthon
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index de7e80787..8a9c69a32 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -55,6 +55,10 @@
False
..\packages\FluentValidation.5.4.0.0\lib\Net40\FluentValidation.dll
+
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+ True
+
False
..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll
@@ -82,9 +86,6 @@
..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NCrunch.Framework.1.46.0.9\lib\net35\NCrunch.Framework.dll
diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config
index 4e6186001..55806b64d 100644
--- a/src/NzbDrone.Core.Test/packages.config
+++ b/src/NzbDrone.Core.Test/packages.config
@@ -5,7 +5,7 @@
-
+
diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index 0ae1cd8d3..e4959a6a2 100644
--- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -63,6 +63,10 @@
False
..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll
+
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+ True
+
False
..\packages\Nancy.0.23.2\lib\net40\Nancy.dll
@@ -82,9 +86,6 @@
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NLog.2.1.0\lib\net40\NLog.dll
diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config
index be1cc6743..fd7a9d17f 100644
--- a/src/NzbDrone.Integration.Test/packages.config
+++ b/src/NzbDrone.Integration.Test/packages.config
@@ -6,7 +6,7 @@
-
+
diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 55917a4d0..77030e610 100644
--- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -44,6 +44,10 @@
..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll
+
+ False
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+
False
..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll
@@ -64,9 +68,6 @@
..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NLog.2.1.0\lib\net40\NLog.dll
diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config
index 4645e5df1..1eca47d0a 100644
--- a/src/NzbDrone.Test.Common/packages.config
+++ b/src/NzbDrone.Test.Common/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
index 0eaf1b438..cdde92607 100644
--- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
+++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
@@ -44,6 +44,10 @@
..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll
+
+ ..\packages\Moq.4.2.1408.0717\lib\net40\Moq.dll
+ True
+
@@ -54,9 +58,6 @@
..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll
-
- ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll
-
..\packages\NLog.2.1.0\lib\net40\NLog.dll
diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config
index ae445db35..ee6fb9de9 100644
--- a/src/NzbDrone.Update.Test/packages.config
+++ b/src/NzbDrone.Update.Test/packages.config
@@ -1,7 +1,7 @@
-
+