diff --git a/Perspex.sln b/Perspex.sln
index ad41eabbeb..ed90a33b4a 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
EndProject
diff --git a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
index 52cee55ccb..4464a5d2a2 100644
--- a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
+++ b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
@@ -37,10 +37,6 @@
4
-
- ..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
- True
-
..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
True
diff --git a/Tests/Perspex.Base.UnitTests/packages.config b/Tests/Perspex.Base.UnitTests/packages.config
index a879004df2..d6259b5ef3 100644
--- a/Tests/Perspex.Base.UnitTests/packages.config
+++ b/Tests/Perspex.Base.UnitTests/packages.config
@@ -1,6 +1,5 @@
-
diff --git a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
index 2198ebc5ed..9979d9dbcf 100644
--- a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
+++ b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
@@ -37,8 +37,8 @@
4
-
- ..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll
True
diff --git a/Tests/Perspex.Controls.UnitTests/app.config b/Tests/Perspex.Controls.UnitTests/app.config
index 5c3b0df066..51810879bd 100644
--- a/Tests/Perspex.Controls.UnitTests/app.config
+++ b/Tests/Perspex.Controls.UnitTests/app.config
@@ -16,7 +16,7 @@
-
+
diff --git a/Tests/Perspex.Controls.UnitTests/packages.config b/Tests/Perspex.Controls.UnitTests/packages.config
index 4bc68e6853..2c3502aad9 100644
--- a/Tests/Perspex.Controls.UnitTests/packages.config
+++ b/Tests/Perspex.Controls.UnitTests/packages.config
@@ -1,19 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
index 8c33cf739a..659a6ab2ce 100644
--- a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
+++ b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
@@ -34,10 +34,6 @@
4
-
- ..\..\packages\AutoFixture.3.30.4\lib\net40\Ploeh.AutoFixture.dll
- True
-
..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll
True
diff --git a/Tests/Perspex.Input.UnitTests/app.config b/Tests/Perspex.Input.UnitTests/app.config
index 133577da84..58c01219df 100644
--- a/Tests/Perspex.Input.UnitTests/app.config
+++ b/Tests/Perspex.Input.UnitTests/app.config
@@ -2,10 +2,6 @@
-
-
-
-
\ No newline at end of file
diff --git a/Tests/Perspex.Input.UnitTests/packages.config b/Tests/Perspex.Input.UnitTests/packages.config
index 78343e06f6..8d87a50891 100644
--- a/Tests/Perspex.Input.UnitTests/packages.config
+++ b/Tests/Perspex.Input.UnitTests/packages.config
@@ -1,12 +1,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tests/Perspex.Layout.UnitTests/app.config b/Tests/Perspex.Layout.UnitTests/app.config
index 133577da84..58c01219df 100644
--- a/Tests/Perspex.Layout.UnitTests/app.config
+++ b/Tests/Perspex.Layout.UnitTests/app.config
@@ -2,10 +2,6 @@
-
-
-
-
\ No newline at end of file
diff --git a/Tests/Perspex.Layout.UnitTests/packages.config b/Tests/Perspex.Layout.UnitTests/packages.config
index f3de0bf097..5f18eeea70 100644
--- a/Tests/Perspex.Layout.UnitTests/packages.config
+++ b/Tests/Perspex.Layout.UnitTests/packages.config
@@ -1,8 +1,5 @@
-
-
-
diff --git a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index 552ece6b69..d1fb4ac797 100644
--- a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -38,16 +38,16 @@
4
-
- ..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET-x86.dll
+
+ ..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET-x64.dll
True
- ..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Core.dll
+ ..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET.Core.dll
True
-
- ..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Wrapper-x86.dll
+
+ ..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET.Wrapper-x64.dll
True
diff --git a/Tests/Perspex.RenderTests/packages.config b/Tests/Perspex.RenderTests/packages.config
index a63910287a..2dcb2cbe2e 100644
--- a/Tests/Perspex.RenderTests/packages.config
+++ b/Tests/Perspex.RenderTests/packages.config
@@ -1,13 +1,12 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
index 1b8c8b359e..47c685dcad 100644
--- a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
+++ b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
@@ -37,8 +37,8 @@
4
-
- ..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll
+
+ ..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll
True
diff --git a/Tests/Perspex.Styling.UnitTests/packages.config b/Tests/Perspex.Styling.UnitTests/packages.config
index 8e78308831..2c3502aad9 100644
--- a/Tests/Perspex.Styling.UnitTests/packages.config
+++ b/Tests/Perspex.Styling.UnitTests/packages.config
@@ -1,17 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file