Merge branch 'master' into fernet

238 files changed, 336 insertions, 347 deletions

diff --git a/tests/hazmat/primitives/test_3des.py b/tests/hazmat/primitives/test_3des.py
new file mode 100644
index 00000000..6b3e0414
--- /dev/null
+++ b/tests/hazmat/primitives/test_3des.py
@@ -0,0 +1,116 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Test using the NIST Test Vectors
+"""
+
+from __future__ import absolute_import, division, print_function
+
+import binascii
+import os
+
+from cryptography.hazmat.primitives.block import ciphers, modes
+
+from .utils import generate_encrypt_test
+from ...utils import load_nist_vectors_from_file
+
+
+class TestTripleDES_CBC(object):
+    test_KAT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "CBC"),
+        [
+            "TCBCinvperm.rsp",
+            "TCBCpermop.rsp",
+            "TCBCsubtab.rsp",
+            "TCBCvarkey.rsp",
+            "TCBCvartext.rsp",
+        ],
+        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
+        lambda keys, iv: modes.CBC(binascii.unhexlify(iv)),
+    )
+
+    test_MMT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "CBC"),
+        [
+            "TCBCMMT1.rsp",
+            "TCBCMMT2.rsp",
+            "TCBCMMT3.rsp",
+        ],
+        lambda key1, key2, key3, iv: (
+            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
+        ),
+        lambda key1, key2, key3, iv: modes.CBC(binascii.unhexlify(iv)),
+    )
+
+
+class TestTripleDES_OFB(object):
+    test_KAT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "OFB"),
+        [
+            "TOFBpermop.rsp",
+            "TOFBsubtab.rsp",
+            "TOFBvarkey.rsp",
+            "TOFBvartext.rsp",
+            "TOFBinvperm.rsp",
+        ],
+        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
+        lambda keys, iv: modes.OFB(binascii.unhexlify(iv)),
+    )
+
+    test_MMT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "OFB"),
+        [
+            "TOFBMMT1.rsp",
+            "TOFBMMT2.rsp",
+            "TOFBMMT3.rsp",
+        ],
+        lambda key1, key2, key3, iv: (
+            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
+        ),
+        lambda key1, key2, key3, iv: modes.OFB(binascii.unhexlify(iv)),
+    )
+
+
+class TestTripleDES_CFB(object):
+    test_KAT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "CFB"),
+        [
+            "TCFB64invperm.rsp",
+            "TCFB64permop.rsp",
+            "TCFB64subtab.rsp",
+            "TCFB64varkey.rsp",
+            "TCFB64vartext.rsp",
+        ],
+        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
+        lambda keys, iv: modes.CFB(binascii.unhexlify(iv)),
+    )
+
+    test_MMT = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "3DES", "CFB"),
+        [
+            "TCFB64MMT1.rsp",
+            "TCFB64MMT2.rsp",
+            "TCFB64MMT3.rsp",
+        ],
+        lambda key1, key2, key3, iv: (
+            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
+        ),
+        lambda key1, key2, key3, iv: modes.CFB(binascii.unhexlify(iv)),
+    )
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
new file mode 100644
index 00000000..0caac3b8
--- /dev/null
+++ b/tests/hazmat/primitives/test_aes.py
@@ -0,0 +1,146 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Test using the NIST Test Vectors
+"""
+
+from __future__ import absolute_import, division, print_function
+
+import binascii
+import os
+
+from cryptography.hazmat.primitives.block import ciphers, modes
+
+from .utils import generate_encrypt_test
+from ...utils import (
+    load_nist_vectors_from_file, load_openssl_vectors_from_file
+)
+
+
+class TestAES_CBC(object):
+    test_CBC = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "AES", "CBC"),
+        [
+            "CBCGFSbox128.rsp",
+            "CBCGFSbox192.rsp",
+            "CBCGFSbox256.rsp",
+            "CBCKeySbox128.rsp",
+            "CBCKeySbox192.rsp",
+            "CBCKeySbox256.rsp",
+            "CBCVarKey128.rsp",
+            "CBCVarKey192.rsp",
+            "CBCVarKey256.rsp",
+            "CBCVarTxt128.rsp",
+            "CBCVarTxt192.rsp",
+            "CBCVarTxt256.rsp",
+            "CBCMMT128.rsp",
+            "CBCMMT192.rsp",
+            "CBCMMT256.rsp",
+        ],
+        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
+        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
+    )
+
+
+class TestAES_ECB(object):
+    test_ECB = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "AES", "ECB"),
+        [
+            "ECBGFSbox128.rsp",
+            "ECBGFSbox192.rsp",
+            "ECBGFSbox256.rsp",
+            "ECBKeySbox128.rsp",
+            "ECBKeySbox192.rsp",
+            "ECBKeySbox256.rsp",
+            "ECBVarKey128.rsp",
+            "ECBVarKey192.rsp",
+            "ECBVarKey256.rsp",
+            "ECBVarTxt128.rsp",
+            "ECBVarTxt192.rsp",
+            "ECBVarTxt256.rsp",
+            "ECBMMT128.rsp",
+            "ECBMMT192.rsp",
+            "ECBMMT256.rsp",
+        ],
+        lambda key: ciphers.AES(binascii.unhexlify(key)),
+        lambda key: modes.ECB(),
+    )
+
+
+class TestAES_OFB(object):
+    test_OFB = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "AES", "OFB"),
+        [
+            "OFBGFSbox128.rsp",
+            "OFBGFSbox192.rsp",
+            "OFBGFSbox256.rsp",
+            "OFBKeySbox128.rsp",
+            "OFBKeySbox192.rsp",
+            "OFBKeySbox256.rsp",
+            "OFBVarKey128.rsp",
+            "OFBVarKey192.rsp",
+            "OFBVarKey256.rsp",
+            "OFBVarTxt128.rsp",
+            "OFBVarTxt192.rsp",
+            "OFBVarTxt256.rsp",
+            "OFBMMT128.rsp",
+            "OFBMMT192.rsp",
+            "OFBMMT256.rsp",
+        ],
+        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
+        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
+    )
+
+
+class TestAES_CFB(object):
+    test_CFB = generate_encrypt_test(
+        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
+        os.path.join("ciphers", "AES", "CFB"),
+        [
+            "CFB128GFSbox128.rsp",
+            "CFB128GFSbox192.rsp",
+            "CFB128GFSbox256.rsp",
+            "CFB128KeySbox128.rsp",
+            "CFB128KeySbox192.rsp",
+            "CFB128KeySbox256.rsp",
+            "CFB128VarKey128.rsp",
+            "CFB128VarKey192.rsp",
+            "CFB128VarKey256.rsp",
+            "CFB128VarTxt128.rsp",
+            "CFB128VarTxt192.rsp",
+            "CFB128VarTxt256.rsp",
+            "CFB128MMT128.rsp",
+            "CFB128MMT192.rsp",
+            "CFB128MMT256.rsp",
+        ],
+        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
+        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
+    )
+
+
+class TestAES_CTR(object):
+    test_CTR = generate_encrypt_test(
+        load_openssl_vectors_from_file,
+        os.path.join("ciphers", "AES", "CTR"),
+        ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
+        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
+        lambda key, iv: modes.CTR(binascii.unhexlify(iv)),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.AES("\x00" * 16), modes.CTR("\x00" * 16)
+        ),
+        skip_message="Does not support AES CTR",
+    )
diff --git a/tests/hazmat/primitives/test_openssl_vectors.py b/tests/hazmat/primitives/test_camellia.py
index 94037247..46e724bb 100644
--- a/tests/hazmat/primitives/test_openssl_vectors.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -12,23 +12,44 @@
 # limitations under the License.
 
 """
-Test using the OpenSSL Test Vectors
+Tests using the CRYPTREC (Camellia) Test Vectors
 """
 
 from __future__ import absolute_import, division, print_function
 
 import binascii
+import os
 
 from cryptography.hazmat.primitives.block import ciphers, modes
 
 from .utils import generate_encrypt_test
-from ...utils import load_openssl_vectors_from_file
+from ...utils import (
+    load_cryptrec_vectors_from_file, load_openssl_vectors_from_file
+)
+
+
+class TestCamelliaECB(object):
+    test_ECB = generate_encrypt_test(
+        load_cryptrec_vectors_from_file,
+        os.path.join("ciphers", "Camellia"),
+        [
+            "camellia-128-ecb.txt",
+            "camellia-192-ecb.txt",
+            "camellia-256-ecb.txt"
+        ],
+        lambda key: ciphers.Camellia(binascii.unhexlify((key))),
+        lambda key: modes.ECB(),
+        only_if=lambda backend: backend.ciphers.supported(
+            ciphers.Camellia("\x00" * 16), modes.ECB()
+        ),
+        skip_message="Does not support Camellia ECB",
+    )
 
 
 class TestCamelliaCBC(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_CBC = generate_encrypt_test(
         load_openssl_vectors_from_file,
-        "Camellia",
+        os.path.join("ciphers", "Camellia"),
         ["camellia-cbc.txt"],
         lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
         lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
@@ -40,9 +61,9 @@ class TestCamelliaCBC(object):
 
 
 class TestCamelliaOFB(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_OFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
-        "Camellia",
+        os.path.join("ciphers", "Camellia"),
         ["camellia-ofb.txt"],
         lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
         lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
@@ -54,9 +75,9 @@ class TestCamelliaOFB(object):
 
 
 class TestCamelliaCFB(object):
-    test_OpenSSL = generate_encrypt_test(
+    test_CFB = generate_encrypt_test(
         load_openssl_vectors_from_file,
-        "Camellia",
+        os.path.join("ciphers", "Camellia"),
         ["camellia-cfb.txt"],
         lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)),
         lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
@@ -65,17 +86,3 @@ class TestCamelliaCFB(object):
         ),
         skip_message="Does not support Camellia CFB",
     )
-
-
-class TestAESCTR(object):
-    test_OpenSSL = generate_encrypt_test(
-        load_openssl_vectors_from_file,
-        "AES",
-        ["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CTR(binascii.unhexlify(iv)),
-        only_if=lambda backend: backend.ciphers.supported(
-            ciphers.AES("\x00" * 16), modes.CTR("\x00" * 16)
-        ),
-        skip_message="Does not support AES CTR",
-    )
diff --git a/tests/hazmat/primitives/test_cryptrec.py b/tests/hazmat/primitives/test_cryptrec.py
deleted file mode 100644
index 48f64a27..00000000
--- a/tests/hazmat/primitives/test_cryptrec.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Tests using the CRYPTREC (Camellia) Test Vectors
-"""
-
-from __future__ import absolute_import, division, print_function
-
-import binascii
-import os
-
-from cryptography.hazmat.primitives.block import ciphers, modes
-
-from .utils import generate_encrypt_test
-from ...utils import load_cryptrec_vectors_from_file
-
-
-class TestCamelliaECB(object):
-    test_NTT = generate_encrypt_test(
-        load_cryptrec_vectors_from_file,
-        os.path.join("Camellia", "NTT"),
-        [
-            "camellia-128-ecb.txt",
-            "camellia-192-ecb.txt",
-            "camellia-256-ecb.txt"
-        ],
-        lambda key: ciphers.Camellia(binascii.unhexlify((key))),
-        lambda key: modes.ECB(),
-        only_if=lambda backend: backend.ciphers.supported(
-            ciphers.Camellia("\x00" * 16), modes.ECB()
-        ),
-        skip_message="Does not support Camellia ECB",
-    )
diff --git a/tests/hazmat/primitives/test_hash_vectors.py b/tests/hazmat/primitives/test_hash_vectors.py
index ebb24350..5c3e72d4 100644
--- a/tests/hazmat/primitives/test_hash_vectors.py
+++ b/tests/hazmat/primitives/test_hash_vectors.py
@@ -24,7 +24,7 @@ from ...utils import load_hash_vectors_from_file
 class TestSHA1(object):
     test_SHA1 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("NIST", "SHABYTE"),
+        os.path.join("hashes", "SHA1"),
         [
             "SHA1LongMsg.rsp",
             "SHA1ShortMsg.rsp",
@@ -38,7 +38,7 @@ class TestSHA1(object):
 class TestSHA224(object):
     test_SHA224 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("NIST", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA224LongMsg.rsp",
             "SHA224ShortMsg.rsp",
@@ -52,7 +52,7 @@ class TestSHA224(object):
 class TestSHA256(object):
     test_SHA256 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("NIST", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA256LongMsg.rsp",
             "SHA256ShortMsg.rsp",
@@ -66,7 +66,7 @@ class TestSHA256(object):
 class TestSHA384(object):
     test_SHA384 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("NIST", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA384LongMsg.rsp",
             "SHA384ShortMsg.rsp",
@@ -80,7 +80,7 @@ class TestSHA384(object):
 class TestSHA512(object):
     test_SHA512 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("NIST", "SHABYTE"),
+        os.path.join("hashes", "SHA2"),
         [
             "SHA512LongMsg.rsp",
             "SHA512ShortMsg.rsp",
@@ -94,7 +94,7 @@ class TestSHA512(object):
 class TestRIPEMD160(object):
     test_RIPEMD160 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("ISO", "ripemd160"),
+        os.path.join("hashes", "ripemd160"),
         [
             "ripevectors.txt",
         ],
@@ -114,7 +114,7 @@ class TestRIPEMD160(object):
 class TestWhirlpool(object):
     test_whirlpool = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("ISO", "whirlpool"),
+        os.path.join("hashes", "whirlpool"),
         [
             "iso-test-vectors.txt",
         ],
@@ -136,7 +136,7 @@ class TestWhirlpool(object):
 class TestMD5(object):
     test_md5 = generate_hash_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "MD5"),
+        os.path.join("hashes", "MD5"),
         [
             "rfc-1321.txt",
         ],
diff --git a/tests/hazmat/primitives/test_hmac_vectors.py b/tests/hazmat/primitives/test_hmac_vectors.py
index 81fe4d3e..27b45012 100644
--- a/tests/hazmat/primitives/test_hmac_vectors.py
+++ b/tests/hazmat/primitives/test_hmac_vectors.py
@@ -13,8 +13,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-import os
-
 from cryptography.hazmat.primitives import hashes
 
 from .utils import generate_hmac_test
@@ -24,7 +22,7 @@ from ...utils import load_hash_vectors_from_file
 class TestHMAC_MD5(object):
     test_hmac_md5 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-2202-md5.txt",
         ],
@@ -37,7 +35,7 @@ class TestHMAC_MD5(object):
 class TestHMAC_SHA1(object):
     test_hmac_sha1 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-2202-sha1.txt",
         ],
@@ -50,7 +48,7 @@ class TestHMAC_SHA1(object):
 class TestHMAC_SHA224(object):
     test_hmac_sha224 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-4231-sha224.txt",
         ],
@@ -63,7 +61,7 @@ class TestHMAC_SHA224(object):
 class TestHMAC_SHA256(object):
     test_hmac_sha256 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-4231-sha256.txt",
         ],
@@ -76,7 +74,7 @@ class TestHMAC_SHA256(object):
 class TestHMAC_SHA384(object):
     test_hmac_sha384 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-4231-sha384.txt",
         ],
@@ -89,7 +87,7 @@ class TestHMAC_SHA384(object):
 class TestHMAC_SHA512(object):
     test_hmac_sha512 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-4231-sha512.txt",
         ],
@@ -102,7 +100,7 @@ class TestHMAC_SHA512(object):
 class TestHMAC_RIPEMD160(object):
     test_hmac_ripemd160 = generate_hmac_test(
         load_hash_vectors_from_file,
-        os.path.join("RFC", "HMAC"),
+        "HMAC",
         [
             "rfc-2286-ripemd160.txt",
         ],
diff --git a/tests/hazmat/primitives/test_nist.py b/tests/hazmat/primitives/test_nist.py
deleted file mode 100644
index c15afd5d..00000000
--- a/tests/hazmat/primitives/test_nist.py
+++ /dev/null
@@ -1,256 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Test using the NIST Test Vectors
-"""
-
-from __future__ import absolute_import, division, print_function
-
-import binascii
-import os
-
-from cryptography.hazmat.primitives.block import ciphers, modes
-
-from .utils import generate_encrypt_test
-from ...utils import load_nist_vectors_from_file
-
-
-class TestAES_CBC(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "CBCGFSbox128.rsp",
-            "CBCGFSbox192.rsp",
-            "CBCGFSbox256.rsp",
-            "CBCKeySbox128.rsp",
-            "CBCKeySbox192.rsp",
-            "CBCKeySbox256.rsp",
-            "CBCVarKey128.rsp",
-            "CBCVarKey192.rsp",
-            "CBCVarKey256.rsp",
-            "CBCVarTxt128.rsp",
-            "CBCVarTxt192.rsp",
-            "CBCVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "CBCMMT128.rsp",
-            "CBCMMT192.rsp",
-            "CBCMMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-
-class TestAES_ECB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "ECBGFSbox128.rsp",
-            "ECBGFSbox192.rsp",
-            "ECBGFSbox256.rsp",
-            "ECBKeySbox128.rsp",
-            "ECBKeySbox192.rsp",
-            "ECBKeySbox256.rsp",
-            "ECBVarKey128.rsp",
-            "ECBVarKey192.rsp",
-            "ECBVarKey256.rsp",
-            "ECBVarTxt128.rsp",
-            "ECBVarTxt192.rsp",
-            "ECBVarTxt256.rsp",
-        ],
-        lambda key: ciphers.AES(binascii.unhexlify(key)),
-        lambda key: modes.ECB(),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "ECBMMT128.rsp",
-            "ECBMMT192.rsp",
-            "ECBMMT256.rsp",
-        ],
-        lambda key: ciphers.AES(binascii.unhexlify(key)),
-        lambda key: modes.ECB(),
-    )
-
-
-class TestAES_OFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "OFBGFSbox128.rsp",
-            "OFBGFSbox192.rsp",
-            "OFBGFSbox256.rsp",
-            "OFBKeySbox128.rsp",
-            "OFBKeySbox192.rsp",
-            "OFBKeySbox256.rsp",
-            "OFBVarKey128.rsp",
-            "OFBVarKey192.rsp",
-            "OFBVarKey256.rsp",
-            "OFBVarTxt128.rsp",
-            "OFBVarTxt192.rsp",
-            "OFBVarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "OFBMMT128.rsp",
-            "OFBMMT192.rsp",
-            "OFBMMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestAES_CFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "KAT"),
-        [
-            "CFB128GFSbox128.rsp",
-            "CFB128GFSbox192.rsp",
-            "CFB128GFSbox256.rsp",
-            "CFB128KeySbox128.rsp",
-            "CFB128KeySbox192.rsp",
-            "CFB128KeySbox256.rsp",
-            "CFB128VarKey128.rsp",
-            "CFB128VarKey192.rsp",
-            "CFB128VarKey256.rsp",
-            "CFB128VarTxt128.rsp",
-            "CFB128VarTxt192.rsp",
-            "CFB128VarTxt256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("AES", "MMT"),
-        [
-            "CFB128MMT128.rsp",
-            "CFB128MMT192.rsp",
-            "CFB128MMT256.rsp",
-        ],
-        lambda key, iv: ciphers.AES(binascii.unhexlify(key)),
-        lambda key, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_CBC(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TCBCinvperm.rsp",
-            "TCBCpermop.rsp",
-            "TCBCsubtab.rsp",
-            "TCBCvarkey.rsp",
-            "TCBCvartext.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TCBCMMT1.rsp",
-            "TCBCMMT2.rsp",
-            "TCBCMMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.CBC(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_OFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TOFBpermop.rsp",
-            "TOFBsubtab.rsp",
-            "TOFBvarkey.rsp",
-            "TOFBvartext.rsp",
-            "TOFBinvperm.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TOFBMMT1.rsp",
-            "TOFBMMT2.rsp",
-            "TOFBMMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.OFB(binascii.unhexlify(iv)),
-    )
-
-
-class TestTripleDES_CFB(object):
-    test_KAT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "KAT"),
-        [
-            "TCFB64invperm.rsp",
-            "TCFB64permop.rsp",
-            "TCFB64subtab.rsp",
-            "TCFB64varkey.rsp",
-            "TCFB64vartext.rsp",
-        ],
-        lambda keys, iv: ciphers.TripleDES(binascii.unhexlify(keys)),
-        lambda keys, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
-
-    test_MMT = generate_encrypt_test(
-        lambda path: load_nist_vectors_from_file(path, "ENCRYPT"),
-        os.path.join("3DES", "MMT"),
-        [
-            "TCFB64MMT1.rsp",
-            "TCFB64MMT2.rsp",
-            "TCFB64MMT3.rsp",
-        ],
-        lambda key1, key2, key3, iv: (
-            ciphers.TripleDES(binascii.unhexlify(key1 + key2 + key3))
-        ),
-        lambda key1, key2, key3, iv: modes.CFB(binascii.unhexlify(iv)),
-    )
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-2202-md5.txt
index 41228461..41228461 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-md5.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-2202-md5.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-2202-sha1.txt
index 80238303..80238303 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2202-sha1.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-2202-sha1.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-2286-ripemd160.txt
index 62e09922..62e09922 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-2286-ripemd160.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-2286-ripemd160.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha224.txt
index 8fd91603..8fd91603 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha224.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha224.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha256.txt
index 94f6b6eb..94f6b6eb 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha256.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha256.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha384.txt
index 07cebefe..07cebefe 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha384.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha384.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha512.txt
index f1676934..f1676934 100644
--- a/tests/hazmat/primitives/vectors/RFC/HMAC/rfc-4231-sha512.txt
+++ b/tests/hazmat/primitives/vectors/HMAC/rfc-4231-sha512.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
index 4066f702..4066f702 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
index ad264553..ad264553 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
index 94e84fa8..94e84fa8 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCIMMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
index 925ac230..925ac230 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIinvperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
index c713cd11..c713cd11 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIpermop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
index fc4a9127..fc4a9127 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIsubtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
index c92fb9e0..c92fb9e0 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvarkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
index d5f264bf..d5f264bf 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCIvartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCIvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
index d56756a8..d56756a8 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
index 23b29385..23b29385 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
index c9ce860c..c9ce860c 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCBCMMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
index f4e302c5..f4e302c5 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCinvperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
index 12eeca46..12eeca46 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCpermop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
index 76a461a4..76a461a4 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCsubtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
index cd781285..cd781285 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvarkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
index f93b71cb..f93b71cb 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCBCvartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CBC/TCBCvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
index dd006dac..dd006dac 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
index 552d4996..552d4996 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
index 148b8d61..148b8d61 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB1MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
index 4a91ce8a..4a91ce8a 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
index 86d3b626..86d3b626 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
index 7e052adb..7e052adb 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
index 26bedb0f..26bedb0f 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
index 6256c160..6256c160 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB1vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB1vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
index 5a72e637..5a72e637 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
index b9206150..b9206150 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
index a4df2c80..a4df2c80 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB64MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
index 268340e9..268340e9 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
index c9060afe..c9060afe 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
index 72114603..72114603 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
index 426371f8..426371f8 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
index 01b78d23..01b78d23 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB64vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB64vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
index f358649e..f358649e 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
index 14f90316..14f90316 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
index b80a4366..b80a4366 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFB8MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
index 87186c90..87186c90 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
index e676e53d..e676e53d 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
index 76326440..76326440 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
index f54c46b0..f54c46b0 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
index b2997266..b2997266 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFB8vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFB8vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
index 0a7044ce..0a7044ce 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
index d49eb8c4..d49eb8c4 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
index 5a0e2493..5a0e2493 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP1MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
index 1d42ed71..1d42ed71 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
index 754ea0f8..754ea0f8 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
index a7b6fa1e..a7b6fa1e 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
index 3019638d..3019638d 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
index daa970e4..daa970e4 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP1vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP1vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
index 96240f50..96240f50 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
index f6a6efdd..f6a6efdd 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
index e62eb0e2..e62eb0e2 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP64MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
index 4528fa3d..4528fa3d 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
index e8ee37c2..e8ee37c2 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
index 067f8a8a..067f8a8a 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
index 448a9457..448a9457 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
index a21df78c..a21df78c 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP64vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP64vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
index cc0e7560..cc0e7560 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
index 2a99f218..2a99f218 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
index 5e4e5090..5e4e5090 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TCFBP8MMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8MMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
index 21af9f1b..21af9f1b 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8invperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8invperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
index a4ce85ce..a4ce85ce 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8permop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8permop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
index adff4bd4..adff4bd4 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8subtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8subtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
index 4b868cef..4b868cef 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8varkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8varkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
index b932d21b..b932d21b 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TCFBP8vartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/CFB/TCFBP8vartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
index 5662fa1f..5662fa1f 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
index a9228667..a9228667 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
index 45d11b31..45d11b31 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TECBMMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
index 1b119d58..1b119d58 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBinvperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp
index 705c8cac..705c8cac 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBpermop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
index 2341f79c..2341f79c 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBsubtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
index 7171c363..7171c363 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvarkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp
index d3ac60c2..d3ac60c2 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TECBvartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/ECB/TECBvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
index d666deec..d666deec 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
index 45fb0c00..45fb0c00 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
index 522be30b..522be30b 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBIMMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
index 4fccd4e4..4fccd4e4 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIinvperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
index 05478d70..05478d70 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIpermop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
index 7cd58266..7cd58266 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIsubtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
index f127d252..f127d252 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvarkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
index e7aaebfd..e7aaebfd 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBIvartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBIvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
index 59ceb31f..59ceb31f 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT1.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT1.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
index 919fcbb2..919fcbb2 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT2.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT2.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
index 17f4d259..17f4d259 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/MMT/TOFBMMT3.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBMMT3.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
index 59068927..59068927 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBinvperm.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBinvperm.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
index 4b24fc92..4b24fc92 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBpermop.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBpermop.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
index 18d8c064..18d8c064 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBsubtab.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBsubtab.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
index e389849b..e389849b 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvarkey.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvarkey.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
index 8b468280..8b468280 100644
--- a/tests/hazmat/primitives/vectors/NIST/3DES/KAT/TOFBvartext.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/3DES/OFB/TOFBvartext.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
index 8624a2bf..8624a2bf 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
index 29898cc2..29898cc2 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
index ad811435..ad811435 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCGFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
index 6bb67fd4..6bb67fd4 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
index 4c64fc5b..4c64fc5b 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
index 696c3304..696c3304 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCKeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp
index c0a6aec0..c0a6aec0 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp
index 2ce5d0af..2ce5d0af 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp
index 8f15f1a9..8f15f1a9 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CBCMMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
index 0ee5c2af..0ee5c2af 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
index 2f5dc5e7..2f5dc5e7 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
index d0e02bde..d0e02bde 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
index f9fab992..f9fab992 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
index dfe97331..dfe97331 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
index 79d8050c..79d8050c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CBCVarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CBC/CBCVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
index 1beee710..1beee710 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
index aa9cd3cf..aa9cd3cf 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
index 9cb27f5d..9cb27f5d 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128GFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
index adad1be4..adad1be4 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
index b3ada536..b3ada536 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
index 0b09ff61..0b09ff61 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128KeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
index b7b47ab6..b7b47ab6 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
index 069fe302..069fe302 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
index 3a7620c7..3a7620c7 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB128MMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
index c1668f45..c1668f45 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
index a2050f97..a2050f97 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
index e3fe5a10..e3fe5a10 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
index 8dd4b040..8dd4b040 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
index d6deac63..d6deac63 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
index 919b0249..919b0249 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB128VarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB128VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
index ebdf45bb..ebdf45bb 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
index 1d6eaf00..1d6eaf00 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
index 99eb7ec2..99eb7ec2 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1GFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
index edd7549e..edd7549e 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
index b4c1454c..b4c1454c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
index 14af04bd..14af04bd 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1KeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
index d371a35c..d371a35c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
index 3687a5df..3687a5df 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
index aef38ffd..aef38ffd 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB1MMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
index 1129b51f..1129b51f 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
index edcab6a4..edcab6a4 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
index 62294c37..62294c37 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
index 96405529..96405529 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
index 73354984..73354984 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
index b29c619e..b29c619e 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB1VarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB1VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
index 2083b0d7..2083b0d7 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
index e8d7b029..e8d7b029 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
index a254784d..a254784d 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8GFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8GFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
index 8fff8c40..8fff8c40 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
index b8d3a91c..b8d3a91c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
index 75fe0af1..75fe0af1 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8KeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8KeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
index 03a22039..03a22039 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
index 945a4ef9..945a4ef9 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
index ca80e432..ca80e432 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/CFB8MMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8MMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
index c56bea1f..c56bea1f 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
index 7219fa8e..7219fa8e 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
index 6b000dbc..6b000dbc 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
index 32d615a9..32d615a9 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
index 04d7fc6b..04d7fc6b 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
index ef4b9b6f..ef4b9b6f 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/CFB8VarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CFB/CFB8VarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-128-ctr.txt
index f4ce15eb..f4ce15eb 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-128-ctr.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-128-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-192-ctr.txt
index 9e166fc4..9e166fc4 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-192-ctr.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-192-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-256-ctr.txt
index d4998750..d4998750 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/AES/aes-256-ctr.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/CTR/aes-256-ctr.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
index f3f4e85e..f3f4e85e 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
index eccb3331..eccb3331 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
index 1f8488f7..1f8488f7 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBGFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
index f5a28327..f5a28327 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
index eafd37a7..eafd37a7 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
index 0063b7eb..0063b7eb 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBKeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp
index f1364c07..f1364c07 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp
index 2e3f5051..2e3f5051 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp
index c18c7648..c18c7648 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/ECBMMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
index 0d7fa96f..0d7fa96f 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
index 3077fe7c..3077fe7c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
index 9e5822be..9e5822be 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
index 9808157b..9808157b 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
index 1b280d46..1b280d46 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
index 708eae81..708eae81 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/ECBVarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/ECB/ECBVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
index b35b03f6..b35b03f6 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
index 678a8fd5..678a8fd5 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
index a79e7802..a79e7802 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmDecrypt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmDecrypt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
index 7f694e57..7f694e57 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
index 4cdfdf20..4cdfdf20 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
index 60da5fae..60da5fae 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/gcmtestvectors/gcmEncryptExtIV256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/GCM/gcmEncryptExtIV256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
index 5eb7c5b3..5eb7c5b3 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
index 79ce685a..79ce685a 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
index 2d70a3bc..2d70a3bc 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBGFSbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBGFSbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
index 113361ee..113361ee 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
index 04dd4289..04dd4289 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
index aa2f4f00..aa2f4f00 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBKeySbox256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBKeySbox256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp
index 14c33b76..14c33b76 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp
index 5457f775..5457f775 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp
index b1d6636a..b1d6636a 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/MMT/OFBMMT256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBMMT256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
index 29a49b9f..29a49b9f 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
index ca35afa8..ca35afa8 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
index a98e166d..a98e166d 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarKey256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarKey256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
index 6edb9a74..6edb9a74 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
index f98e0372..f98e0372 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt192.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt192.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
index 7daa17e5..7daa17e5 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/KAT/OFBVarTxt256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/OFB/OFBVarTxt256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
index 3d52285c..3d52285c 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
index 1e711c70..1e711c70 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-128hexstr/XTSGenAES256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-128hexstr/XTSGenAES256.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES128.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
index 4d92a6a3..4d92a6a3 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES128.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES128.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES256.rsp b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
index e4050d79..e4050d79 100755
--- a/tests/hazmat/primitives/vectors/NIST/AES/XTSTestVectors/tweak-dataunitseqno/XTSGenAES256.rsp
+++ b/tests/hazmat/primitives/vectors/ciphers/AES/XTS/tweak-dataunitseqno/XTSGenAES256.rsp
diff --git a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-128-ecb.txt
index ec8c1a1f..ec8c1a1f 100644
--- a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-128-ecb.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-128-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-192-ecb.txt
index b3e26435..b3e26435 100644
--- a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-192-ecb.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-192-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-256-ecb.txt
index e28c089c..e28c089c 100644
--- a/tests/hazmat/primitives/vectors/CRYPTREC/Camellia/NTT/camellia-256-ecb.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-256-ecb.txt
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cbc.txt
index 219be470..219be470 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cbc.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cbc.txt
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cfb.txt
index 0e9163ed..0e9163ed 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-cfb.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-cfb.txt
diff --git a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-ofb.txt
index 6294f111..6294f111 100644
--- a/tests/hazmat/primitives/vectors/OpenSSL/Camellia/camellia-ofb.txt
+++ b/tests/hazmat/primitives/vectors/ciphers/Camellia/camellia-ofb.txt
diff --git a/tests/hazmat/primitives/vectors/RFC/MD5/rfc-1321.txt b/tests/hazmat/primitives/vectors/hashes/MD5/rfc-1321.txt
index 1ca16a3c..1ca16a3c 100644
--- a/tests/hazmat/primitives/vectors/RFC/MD5/rfc-1321.txt
+++ b/tests/hazmat/primitives/vectors/hashes/MD5/rfc-1321.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt
index de6b122e..de6b122e 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/Readme.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/Readme.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp
index ef0e21bc..ef0e21bc 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1LongMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp
index 5088defa..5088defa 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt
index 37cf7a82..37cf7a82 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1Monte.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1Monte.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp
index 35aa9b5f..35aa9b5f 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA1ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA1/SHA1ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
new file mode 100755
index 00000000..de6b122e
--- /dev/null
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/Readme.txt
@@ -0,0 +1,17 @@
+There are two sets of SHA example files:

+

+1. The response (.rsp) files contain properly formatted CAVS response files.

+

+2. The intermediate value (.txt) files for the Monte Carlo tests contain

+   values for the inner loop as shown in the pseudocode in Figure 1 on page 9

+   of the SHA Validation System.  The inner loop variable 'i' ranges in value

+   from 3 to 1002.  The intermediate values for the first five iterations of

+   the inner loop therefore correspond to 'i' values of 3 to 7. The message (M)

+   and the message digest (MDi) for each of these i are printed out, indented

+   by one tab space.  The final message digest (MD), not indented, is the last

+   value printed for each count.

+

+   

+The SHA Validation System document can be found at:

+

+http://csrc.nist.gov/groups/STM/cavp/documents/shs/SHAVS.pdf.
\ No newline at end of file
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp
index 09497b4f..09497b4f 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224LongMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp
index 50648b8d..50648b8d 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt
index 1c500e32..1c500e32 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224Monte.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224Monte.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp
index a4542c38..a4542c38 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA224ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA224ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp
index 967db2e4..967db2e4 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256LongMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp
index bda7a9e4..bda7a9e4 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt
index 27a161e2..27a161e2 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256Monte.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256Monte.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp
index ddcfefbd..ddcfefbd 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA256ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA256ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp
index 4d8404bc..4d8404bc 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384LongMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp
index c7c30e7a..c7c30e7a 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt
index a548cbce..a548cbce 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384Monte.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384Monte.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp
index 15fd9adf..15fd9adf 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA384ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA384ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp
index c601ed15..c601ed15 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512LongMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512LongMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp
index 0b9c295a..0b9c295a 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.rsp
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt
index 5753952d..5753952d 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512Monte.txt
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512Monte.txt
diff --git a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp
index ab5cd2a1..ab5cd2a1 100755
--- a/tests/hazmat/primitives/vectors/NIST/SHABYTE/SHA512ShortMsg.rsp
+++ b/tests/hazmat/primitives/vectors/hashes/SHA2/SHA512ShortMsg.rsp
diff --git a/tests/hazmat/primitives/vectors/ISO/ripemd160/ripevectors.txt b/tests/hazmat/primitives/vectors/hashes/ripemd160/ripevectors.txt
index 4f880023..4f880023 100644
--- a/tests/hazmat/primitives/vectors/ISO/ripemd160/ripevectors.txt
+++ b/tests/hazmat/primitives/vectors/hashes/ripemd160/ripevectors.txt
diff --git a/tests/hazmat/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt b/tests/hazmat/primitives/vectors/hashes/whirlpool/iso-test-vectors.txt
index 08044c0b..08044c0b 100755
--- a/tests/hazmat/primitives/vectors/ISO/whirlpool/iso-test-vectors.txt
+++ b/tests/hazmat/primitives/vectors/hashes/whirlpool/iso-test-vectors.txt
diff --git a/tests/test_utils.py b/tests/test_utils.py
index db9ac085..0692c8d1 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 import textwrap
 
 import pytest
@@ -133,7 +134,7 @@ def test_load_nist_vectors_decrypt():
 
 def test_load_nist_vectors_from_file_encrypt():
     assert load_nist_vectors_from_file(
-        "AES/KAT/CBCGFSbox128.rsp",
+        os.path.join("ciphers", "AES", "CBC", "CBCGFSbox128.rsp"),
         "ENCRYPT"
     ) == [
         {
@@ -183,7 +184,7 @@ def test_load_nist_vectors_from_file_encrypt():
 
 def test_load_nist_vectors_from_file_decrypt():
     assert load_nist_vectors_from_file(
-        "AES/KAT/CBCGFSbox128.rsp",
+        os.path.join("ciphers", "AES", "CBC", "CBCGFSbox128.rsp"),
         "DECRYPT",
     ) == [
         {
@@ -287,7 +288,7 @@ def test_load_cryptrec_vectors_invalid():
 
 def test_load_cryptrec_vectors_from_file_encrypt():
     test_set = load_cryptrec_vectors_from_file(
-        "Camellia/NTT/camellia-128-ecb.txt"
+        os.path.join("ciphers", "Camellia", "camellia-128-ecb.txt"),
     )
     assert test_set[0] == (
         {
@@ -351,7 +352,9 @@ def test_load_openssl_vectors():
 
 
 def test_load_openssl_vectors_from_file():
-    test_list = load_openssl_vectors_from_file("Camellia/camellia-ofb.txt")
+    test_list = load_openssl_vectors_from_file(
+        os.path.join("ciphers", "Camellia", "camellia-ofb.txt")
+    )
     assert len(test_list) == 24
     assert test_list[:4] == [
         {
@@ -440,7 +443,9 @@ def test_load_hash_vectors_bad_data():
 
 
 def test_load_hash_vectors_from_file():
-    test_list = load_hash_vectors_from_file("RFC/MD5/rfc-1321.txt")
+    test_list = load_hash_vectors_from_file(
+        os.path.join("hashes", "MD5", "rfc-1321.txt")
+    )
     assert len(test_list) == 7
     assert test_list[:4] == [
         (b"", "d41d8cd98f00b204e9800998ecf8427e"),
diff --git a/tests/utils.py b/tests/utils.py
index ad676c04..99ba2e2f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -53,7 +53,7 @@ def load_nist_vectors(vector_data, op):
 
 def load_nist_vectors_from_file(filename, op):
     base = os.path.join(
-        os.path.dirname(__file__), "hazmat", "primitives", "vectors", "NIST",
+        os.path.dirname(__file__), "hazmat", "primitives", "vectors",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_nist_vectors(vector_file, op)
@@ -62,7 +62,7 @@ def load_nist_vectors_from_file(filename, op):
 def load_cryptrec_vectors_from_file(filename):
     base = os.path.join(
         os.path.dirname(__file__),
-        "hazmat", "primitives", "vectors", "CRYPTREC",
+        "hazmat", "primitives", "vectors",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_cryptrec_vectors(vector_file)
@@ -99,7 +99,7 @@ def load_cryptrec_vectors(vector_data):
 def load_openssl_vectors_from_file(filename):
     base = os.path.join(
         os.path.dirname(__file__),
-        "hazmat", "primitives", "vectors", "OpenSSL",
+        "hazmat", "primitives", "vectors",
     )
     with open(os.path.join(base, filename), "r") as vector_file:
         return load_openssl_vectors(vector_file)