diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln
index 8e420cc1..c88c8876 100644
--- a/SafeExamBrowser.sln
+++ b/SafeExamBrowser.sln
@@ -180,48 +180,48 @@ Global
 		{C9416A62-0623-4D38-96AA-92516B32F02F}.Debug|x86.Build.0 = Debug|x86
 		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.ActiveCfg = Release|Any CPU
-		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.Build.0 = Release|Any CPU
+		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.ActiveCfg = Release|x86
+		{C9416A62-0623-4D38-96AA-92516B32F02F}.Release|x86.Build.0 = Release|x86
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|x86.ActiveCfg = Debug|x86
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Debug|x86.Build.0 = Debug|x86
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.Build.0 = Release|Any CPU
+		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.ActiveCfg = Release|x86
+		{21137D66-7D01-4327-92D2-0304C25CD7DF}.Release|x86.Build.0 = Release|x86
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|x86.ActiveCfg = Debug|x86
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Debug|x86.Build.0 = Debug|x86
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.ActiveCfg = Release|Any CPU
-		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.Build.0 = Release|Any CPU
+		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.ActiveCfg = Release|x86
+		{10C62628-8E6A-45AA-9D97-339B119AD21D}.Release|x86.Build.0 = Release|x86
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|x86.ActiveCfg = Debug|x86
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Debug|x86.Build.0 = Debug|x86
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.ActiveCfg = Release|Any CPU
-		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.Build.0 = Release|Any CPU
+		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.ActiveCfg = Release|x86
+		{9ABB1BDE-03E1-4076-8F8B-FDA1E61ED675}.Release|x86.Build.0 = Release|x86
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|x86.ActiveCfg = Debug|x86
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Debug|x86.Build.0 = Debug|x86
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.ActiveCfg = Release|Any CPU
-		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.Build.0 = Release|Any CPU
+		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.ActiveCfg = Release|x86
+		{E107026C-2011-4552-A7D8-3A0D37881DF6}.Release|x86.Build.0 = Release|x86
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Debug|x86.ActiveCfg = Debug|x86
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Debug|x86.Build.0 = Debug|x86
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.Build.0 = Release|Any CPU
+		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.ActiveCfg = Release|x86
+		{7F012305-1125-47CE-9C2A-146C891C0924}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index 13a70a8d..1346b90b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ build_script:
  - msbuild /verbosity:minimal "SafeExamBrowser.sln"
 test_script:
  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor SafeExamBrowser.Client.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -output:"coverage.xml"
-  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Communication.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Communication.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
+ - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Communication.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Communication.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Core.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Core.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.I18n.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.I18n.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
  - .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Logging.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Logging.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"