diff --git a/Filelist.txt b/Filelist.txt
index 26ae40f6..dbb67090 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -476,6 +476,7 @@ TestVectors/camellia.txt
 TestVectors/cham.txt
 TestVectors/ccm.txt
 TestVectors/chacha.txt
+TestVectors/chacha_tls.txt
 TestVectors/cmac.txt
 TestVectors/dlies.txt
 TestVectors/dsa.txt
diff --git a/TestVectors/tls_chacha.txt b/TestVectors/chacha_tls.txt
similarity index 100%
rename from TestVectors/tls_chacha.txt
rename to TestVectors/chacha_tls.txt
diff --git a/cryptest.vcxproj.filters b/cryptest.vcxproj.filters
index cbcbebd8..197aeb00 100644
--- a/cryptest.vcxproj.filters
+++ b/cryptest.vcxproj.filters
@@ -11,7 +11,7 @@
     </Filter>
     <Filter Include="TestData">
       <UniqueIdentifier>{a634d4f4-ddc0-44b4-9c37-d9ffdddc7b06}</UniqueIdentifier>
-      <Extensions>.dat</Extensions>
+      <Extensions>.dat;.bin</Extensions>
     </Filter>
     <Filter Include="TestVectors">
       <UniqueIdentifier>{2e247f14-f75a-4e15-9804-dccce165306f}</UniqueIdentifier>
@@ -23,6 +23,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <!-- Begin Test Vectors -->
     <None Include="TestVectors\aes.txt">
       <Filter>TestVectors</Filter>
     </None>
@@ -50,6 +51,9 @@
     <None Include="TestVectors\chacha.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\chacha_tls.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\cham.txt">
       <Filter>TestVectors</Filter>
     </None>
@@ -83,6 +87,9 @@
     <None Include="TestVectors\hc256.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\hight.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\hkdf.txt">
       <Filter>TestVectors</Filter>
     </None>
@@ -92,6 +99,9 @@
     <None Include="TestVectors\kalyna.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\keccak.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\lea.txt">
       <Filter>TestVectors</Filter>
     </None>
@@ -134,18 +144,57 @@
     <None Include="TestVectors\sha.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\sha1_160_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha1_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\sha2.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\sha2_224_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha2_256_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha2_384_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha2_512_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha2_fips_180.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\sha3.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\sha3_224_fips_202.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha3_256_fips_202.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha3_384_fips_202.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha3_512_fips_202.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
+    <Text Include="TestVectors\sha3_fips_202.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\shacal2.txt">
       <Filter>TestVectors</Filter>
     </None>
     <None Include="TestVectors\siphash.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <Text Include="TestVectors\simeck.txt">
+      <Filter>TestVectors</Filter>
+    </Text>
     <None Include="TestVectors\simon.txt">
       <Filter>TestVectors</Filter>
     </None>
@@ -179,6 +228,7 @@
     <None Include="TestVectors\whrlpool.txt">
       <Filter>TestVectors</Filter>
     </None>
+    <!-- Begin Test Data -->
     <None Include="TestData\3desval.dat">
       <Filter>TestData</Filter>
     </None>
@@ -197,6 +247,12 @@
     <None Include="TestData\cast256v.dat">
       <Filter>TestData</Filter>
     </None>
+    <None Include="TestData\defdmac1.bin">
+      <Filter>TestData</Filter>
+    </None>
+    <None Include="TestData\defdmac2.bin">
+      <Filter>TestData</Filter>
+    </None>
     <None Include="TestData\descert.dat">
       <Filter>TestData</Filter>
     </None>
@@ -326,6 +382,9 @@
     <None Include="TestData\rsa2048.dat">
       <Filter>TestData</Filter>
     </None>
+    <None Include="TestData\rsa2048a.dat">
+      <Filter>TestData</Filter>
+    </None>
     <None Include="TestData\rsa400pb.dat">
       <Filter>TestData</Filter>
     </None>
@@ -365,6 +424,9 @@
     <None Include="TestData\usage.dat">
       <Filter>TestData</Filter>
     </None>
+    <None Include="TestData\x25519.dat">
+      <Filter>TestData</Filter>
+    </None>
     <None Include="TestData\xtrdh171.dat">
       <Filter>TestData</Filter>
     </None>
@@ -376,6 +438,9 @@
     <ClCompile Include="adhoc.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="test.cpp">
+      <Filter>Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="bench1.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>
@@ -403,9 +468,6 @@
     <ClCompile Include="regtest4.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>
-    <ClCompile Include="test.cpp">
-      <Filter>Source Code</Filter>
-    </ClCompile>
     <ClCompile Include="validat0.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>
@@ -454,4 +516,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cryptlib.vcxproj.filters b/cryptlib.vcxproj.filters
index 9aa10650..d8d09eb9 100644
--- a/cryptlib.vcxproj.filters
+++ b/cryptlib.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">