diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props
deleted file mode 100644
index de8bd4e7..00000000
--- a/builds/msvc/vs2012/test/test.props
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Test Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/test/test.runner.bat b/builds/msvc/vs2012/test/test.runner.bat
deleted file mode 100644
index cd7e7914..00000000
--- a/builds/msvc/vs2012/test/test.runner.bat
+++ /dev/null
@@ -1,78 +0,0 @@
-REM WORK IN PROGRESS
-
-@ECHO OFF
-
-if "%1" == "" (
-    echo "Usage: wintest.bat <DebugDLL | ReleaseDLL | DebugLIB | ReleaseLIB | DebugLTCG | DebugLTCG"
-    goto :END
-)
-
-if "%2" == "x64" (SET ARCH=x64) else (SET ARCH=Win32)
-SET CFLAGS=/nologo /DTEST_SRCDIR=\".\" /I..\..\src\libsodium\include\sodium /I..\..\src\libsodium\include /I..\quirks
-SET LDFLAGS=/link /LTCG advapi32.lib ..\..\Build\%1\%ARCH%\libsodium.lib
-
-if not "%3" == "" (
-    CD %3
-)
-
-if not exist sodium_version.c (
-    if not exist sodium_version.c (
-        echo "Are you on the right path?" %CD%
-        goto :END
-    )
-)
-
-if "%1" == "DebugDLL"   ( goto :DebugDLL )
-if "%1" == "ReleaseDLL" ( goto :ReleaseDLL )
-
-if "%1" == "DebugLIB"   ( goto :DebugLIB )
-if "%1" == "ReleaseLIB"   ( goto :ReleaseLIB )
-
-if "%1" == "DebugLTCG"   ( goto :DebugLTCG )
-if "%1" == "ReleaseLTCG"   ( goto :ReleaseLTCG )
-
-echo "Invalid build type"
-goto :END
-
-:DebugDLL
-    SET CFLAGS=%CFLAGS% /GS /MDd /Od
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH%
-    goto :COMPILE
-:ReleaseDLL
-    SET CFLAGS=%CFLAGS% /MD /Ox 
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH% 
-    goto :COMPILE
-
-:DebugLIB
-    SET CFLAGS=%CFLAGS% /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLIB
-    SET CFLAGS=%CFLAGS% /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:DebugLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:COMPILE
-echo Running the test suite:
-FOR %%f in (*.c) DO (
-    cl %CFLAGS% %%f %LDFLAGS% /errorReport:prompt /OUT:%%f.exe > NUL 2>&1
-    if not exist %%f.exe (
-        echo %%f compile failed
-        goto :END
-    )
-    %%f.exe
-    if errorlevel 1 ( 
-        echo %%f failed
-    ) else (
-        echo %%f ok
-    )
-)
-REM Remove temporary files
-del *.exe *.obj *.res *.exp *.pdb
-
-:END
diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
deleted file mode 100644
index ffd119f8..00000000
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
-    <ProjectName>test</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c" />
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth3.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth5.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth6.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box.c" />
-    <ClCompile Include="..\..\..\..\test\default\box2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box8.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c" />
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c" />
-    <ClCompile Include="..\..\..\..\test\default\core1.c" />
-    <ClCompile Include="..\..\..\..\test\default\core2.c" />
-    <ClCompile Include="..\..\..\..\test\default\core3.c" />
-    <ClCompile Include="..\..\..\..\test\default\core4.c" />
-    <ClCompile Include="..\..\..\..\test\default\core5.c" />
-    <ClCompile Include="..\..\..\..\test\default\core6.c" />
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c" />
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c" />
-    <ClCompile Include="..\..\..\..\test\default\sign.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream2.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream3.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream4.c" />
-    <ClCompile Include="..\..\..\..\test\default\verify1.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters
deleted file mode 100644
index bd235ec2..00000000
--- a/builds/msvc/vs2012/test/test.vcxproj.filters
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{705beade-aa7f-49c0-900e-4b0cbbdc2f7b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sign.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\verify1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props
deleted file mode 100644
index de8bd4e7..00000000
--- a/builds/msvc/vs2013/test/test.props
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Test Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/test/test.runner.bat b/builds/msvc/vs2013/test/test.runner.bat
deleted file mode 100644
index cd7e7914..00000000
--- a/builds/msvc/vs2013/test/test.runner.bat
+++ /dev/null
@@ -1,78 +0,0 @@
-REM WORK IN PROGRESS
-
-@ECHO OFF
-
-if "%1" == "" (
-    echo "Usage: wintest.bat <DebugDLL | ReleaseDLL | DebugLIB | ReleaseLIB | DebugLTCG | DebugLTCG"
-    goto :END
-)
-
-if "%2" == "x64" (SET ARCH=x64) else (SET ARCH=Win32)
-SET CFLAGS=/nologo /DTEST_SRCDIR=\".\" /I..\..\src\libsodium\include\sodium /I..\..\src\libsodium\include /I..\quirks
-SET LDFLAGS=/link /LTCG advapi32.lib ..\..\Build\%1\%ARCH%\libsodium.lib
-
-if not "%3" == "" (
-    CD %3
-)
-
-if not exist sodium_version.c (
-    if not exist sodium_version.c (
-        echo "Are you on the right path?" %CD%
-        goto :END
-    )
-)
-
-if "%1" == "DebugDLL"   ( goto :DebugDLL )
-if "%1" == "ReleaseDLL" ( goto :ReleaseDLL )
-
-if "%1" == "DebugLIB"   ( goto :DebugLIB )
-if "%1" == "ReleaseLIB"   ( goto :ReleaseLIB )
-
-if "%1" == "DebugLTCG"   ( goto :DebugLTCG )
-if "%1" == "ReleaseLTCG"   ( goto :ReleaseLTCG )
-
-echo "Invalid build type"
-goto :END
-
-:DebugDLL
-    SET CFLAGS=%CFLAGS% /GS /MDd /Od
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH%
-    goto :COMPILE
-:ReleaseDLL
-    SET CFLAGS=%CFLAGS% /MD /Ox 
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH% 
-    goto :COMPILE
-
-:DebugLIB
-    SET CFLAGS=%CFLAGS% /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLIB
-    SET CFLAGS=%CFLAGS% /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:DebugLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:COMPILE
-echo Running the test suite:
-FOR %%f in (*.c) DO (
-    cl %CFLAGS% %%f %LDFLAGS% /errorReport:prompt /OUT:%%f.exe > NUL 2>&1
-    if not exist %%f.exe (
-        echo %%f compile failed
-        goto :END
-    )
-    %%f.exe
-    if errorlevel 1 ( 
-        echo %%f failed
-    ) else (
-        echo %%f ok
-    )
-)
-REM Remove temporary files
-del *.exe *.obj *.res *.exp *.pdb
-
-:END
diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
deleted file mode 100644
index 21eeb730..00000000
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
-    <ProjectName>test</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c" />
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth3.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth5.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth6.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box.c" />
-    <ClCompile Include="..\..\..\..\test\default\box2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box8.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c" />
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c" />
-    <ClCompile Include="..\..\..\..\test\default\core1.c" />
-    <ClCompile Include="..\..\..\..\test\default\core2.c" />
-    <ClCompile Include="..\..\..\..\test\default\core3.c" />
-    <ClCompile Include="..\..\..\..\test\default\core4.c" />
-    <ClCompile Include="..\..\..\..\test\default\core5.c" />
-    <ClCompile Include="..\..\..\..\test\default\core6.c" />
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c" />
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c" />
-    <ClCompile Include="..\..\..\..\test\default\sign.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream2.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream3.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream4.c" />
-    <ClCompile Include="..\..\..\..\test\default\verify1.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters
deleted file mode 100644
index 1b3419c0..00000000
--- a/builds/msvc/vs2013/test/test.vcxproj.filters
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{705beade-aa7f-49c0-900e-4b0cbbdc2f7b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\verify1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sign.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2015/test/test.props b/builds/msvc/vs2015/test/test.props
deleted file mode 100644
index de8bd4e7..00000000
--- a/builds/msvc/vs2015/test/test.props
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Test Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2015/test/test.runner.bat b/builds/msvc/vs2015/test/test.runner.bat
deleted file mode 100644
index cd7e7914..00000000
--- a/builds/msvc/vs2015/test/test.runner.bat
+++ /dev/null
@@ -1,78 +0,0 @@
-REM WORK IN PROGRESS
-
-@ECHO OFF
-
-if "%1" == "" (
-    echo "Usage: wintest.bat <DebugDLL | ReleaseDLL | DebugLIB | ReleaseLIB | DebugLTCG | DebugLTCG"
-    goto :END
-)
-
-if "%2" == "x64" (SET ARCH=x64) else (SET ARCH=Win32)
-SET CFLAGS=/nologo /DTEST_SRCDIR=\".\" /I..\..\src\libsodium\include\sodium /I..\..\src\libsodium\include /I..\quirks
-SET LDFLAGS=/link /LTCG advapi32.lib ..\..\Build\%1\%ARCH%\libsodium.lib
-
-if not "%3" == "" (
-    CD %3
-)
-
-if not exist sodium_version.c (
-    if not exist sodium_version.c (
-        echo "Are you on the right path?" %CD%
-        goto :END
-    )
-)
-
-if "%1" == "DebugDLL"   ( goto :DebugDLL )
-if "%1" == "ReleaseDLL" ( goto :ReleaseDLL )
-
-if "%1" == "DebugLIB"   ( goto :DebugLIB )
-if "%1" == "ReleaseLIB"   ( goto :ReleaseLIB )
-
-if "%1" == "DebugLTCG"   ( goto :DebugLTCG )
-if "%1" == "ReleaseLTCG"   ( goto :ReleaseLTCG )
-
-echo "Invalid build type"
-goto :END
-
-:DebugDLL
-    SET CFLAGS=%CFLAGS% /GS /MDd /Od
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH%
-    goto :COMPILE
-:ReleaseDLL
-    SET CFLAGS=%CFLAGS% /MD /Ox 
-    SET PATH=..\..\Build\%1\%ARCH%;%PATH% 
-    goto :COMPILE
-
-:DebugLIB
-    SET CFLAGS=%CFLAGS% /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLIB
-    SET CFLAGS=%CFLAGS% /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:DebugLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /GS /MTd /Od /DSODIUM_STATIC
-    goto :COMPILE
-:ReleaseLTCG
-    SET CFLAGS=%CFLAGS% /LTCG /MT /Ox /DSODIUM_STATIC
-    goto :COMPILE
-
-:COMPILE
-echo Running the test suite:
-FOR %%f in (*.c) DO (
-    cl %CFLAGS% %%f %LDFLAGS% /errorReport:prompt /OUT:%%f.exe > NUL 2>&1
-    if not exist %%f.exe (
-        echo %%f compile failed
-        goto :END
-    )
-    %%f.exe
-    if errorlevel 1 ( 
-        echo %%f failed
-    ) else (
-        echo %%f ok
-    )
-)
-REM Remove temporary files
-del *.exe *.obj *.res *.exp *.pdb
-
-:END
diff --git a/builds/msvc/vs2015/test/test.vcxproj b/builds/msvc/vs2015/test/test.vcxproj
deleted file mode 100644
index 91e9eaab..00000000
--- a/builds/msvc/vs2015/test/test.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
-    <ProjectName>test</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c" />
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth3.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth5.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth6.c" />
-    <ClCompile Include="..\..\..\..\test\default\auth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box.c" />
-    <ClCompile Include="..\..\..\..\test\default\box2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box7.c" />
-    <ClCompile Include="..\..\..\..\test\default\box8.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c" />
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c" />
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c" />
-    <ClCompile Include="..\..\..\..\test\default\core1.c" />
-    <ClCompile Include="..\..\..\..\test\default\core2.c" />
-    <ClCompile Include="..\..\..\..\test\default\core3.c" />
-    <ClCompile Include="..\..\..\..\test\default\core4.c" />
-    <ClCompile Include="..\..\..\..\test\default\core5.c" />
-    <ClCompile Include="..\..\..\..\test\default\core6.c" />
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c" />
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash.c" />
-    <ClCompile Include="..\..\..\..\test\default\hash3.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c" />
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c" />
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c" />
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c" />
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c" />
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c" />
-    <ClCompile Include="..\..\..\..\test\default\sign.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c" />
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream2.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream3.c" />
-    <ClCompile Include="..\..\..\..\test\default\stream4.c" />
-    <ClCompile Include="..\..\..\..\test\default\verify1.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2015/test/test.vcxproj.filters b/builds/msvc/vs2015/test/test.vcxproj.filters
deleted file mode 100644
index 1b3419c0..00000000
--- a/builds/msvc/vs2015/test/test.vcxproj.filters
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{705beade-aa7f-49c0-900e-4b0cbbdc2f7b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\verify1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_argon2i.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\aead_aes256gcm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\aead_chacha20poly1305.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sign.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\stream4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\secretbox8.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\scalarmult5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\hash3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\onetimeauth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core4.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core5.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seed.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\core1.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth6.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\auth3.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\chacha20.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\generichash2.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\test\default\box_seal.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file