diff --git a/source/bson-binary-vector/tests/float32.json b/source/bson-binary-vector/tests/float32.json
new file mode 100644
index 0000000000..9ec72861d4
--- /dev/null
+++ b/source/bson-binary-vector/tests/float32.json
@@ -0,0 +1,45 @@
+{
+  "description": "Tests of Binary subtype 9, Vectors, with dtype FLOAT32",
+  "test_key": "vector",
+  "tests": [
+    {
+      "description": "Simple Vector FLOAT32",
+      "valid": true,
+      "vector": [127.0, 7.0],
+      "dtype_hex": "0x27",
+      "dtype_alias": "FLOAT32",
+      "padding": 0,
+      "canonical_bson": "1C00000005766563746F72000A0000000927000000FE420000E04000", 
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwAAAP5CAADgQA==\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Empty Vector FLOAT32",
+      "valid": true,
+      "vector": [],
+      "dtype_hex": "0x27",
+      "dtype_alias": "FLOAT32",
+      "padding": 0,
+      "canonical_bson": "1400000005766563746F72000200000009270000",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwA=\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Infinity Vector FLOAT32",
+      "valid": true,
+      "vector": ["-inf", 0.0, "inf"],
+      "dtype_hex": "0x27",
+      "dtype_alias": "FLOAT32",
+      "padding": 0,
+      "canonical_bson": "2000000005766563746F72000E000000092700000080FF000000000000807F00",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwAAAID/AAAAAAAAgH8=\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "FLOAT32 with padding",
+      "valid": false,
+      "vector": [127.0, 7.0],
+      "dtype_hex": "0x27",
+      "dtype_alias": "FLOAT32",
+      "padding": 3
+    }
+  ]
+}
+
diff --git a/source/bson-binary-vector/tests/int8.json b/source/bson-binary-vector/tests/int8.json
new file mode 100644
index 0000000000..92eab609e8
--- /dev/null
+++ b/source/bson-binary-vector/tests/int8.json
@@ -0,0 +1,59 @@
+{
+  "description": "Tests of Binary subtype 9, Vectors, with dtype INT8",
+  "test_key": "vector",
+  "tests": [
+    {
+      "description": "Simple Vector INT8",
+      "valid": true,
+      "vector": [127, 7],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 0,
+      "canonical_bson": "1600000005766563746F7200040000000903007F0700",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"AwB/Bw==\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Empty Vector INT8",
+      "valid": true,
+      "vector": [],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 0,
+      "canonical_bson": "1400000005766563746F72000200000009030000",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"AwA=\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Overflow Vector INT8",
+      "valid": false,
+      "vector": [128],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 0
+    },
+    {
+      "description": "Underflow Vector INT8",
+      "valid": false,
+      "vector": [-129],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 0
+    },
+    {
+      "description": "INT8 with padding",
+      "valid": false,
+      "vector": [127, 7],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 3
+    },
+    {
+      "description": "INT8 with float inputs",
+      "valid": false,
+      "vector": [127.77, 7.77],
+      "dtype_hex": "0x03",
+      "dtype_alias": "INT8",
+      "padding": 0
+    }
+  ]
+}
+
diff --git a/source/bson-binary-vector/tests/packed_bit.json b/source/bson-binary-vector/tests/packed_bit.json
new file mode 100644
index 0000000000..de108876a9
--- /dev/null
+++ b/source/bson-binary-vector/tests/packed_bit.json
@@ -0,0 +1,53 @@
+{
+  "description": "Tests of Binary subtype 9, Vectors, with dtype PACKED_BIT",
+  "test_key": "vector",
+  "tests": [
+    {
+      "description": "Simple Vector PACKED_BIT",
+      "valid": true,
+      "vector": [127, 7],
+      "dtype_hex": "0x10",
+      "dtype_alias": "PACKED_BIT",
+      "padding": 0,
+      "canonical_bson": "1600000005766563746F7200040000000910007F0700",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAB/Bw==\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Empty Vector PACKED_BIT",
+      "valid": true,
+      "vector": [],
+      "dtype_hex": "0x10",
+      "dtype_alias": "PACKED_BIT",
+      "padding": 0,
+      "canonical_bson": "1400000005766563746F72000200000009100000",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAA=\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "PACKED_BIT with padding",
+      "valid": true,
+      "vector": [127, 7],
+      "dtype_hex": "0x10",
+      "dtype_alias": "PACKED_BIT",
+      "padding": 3,
+      "canonical_bson": "1600000005766563746F7200040000000910037F0700",
+      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAN/Bw==\", \"subType\": \"09\"}}}"
+    },
+    {
+      "description": "Overflow Vector PACKED_BIT",
+      "valid": false,
+      "vector": [256],
+      "dtype_hex": "0x10",
+      "dtype_alias": "PACKED_BIT",
+      "padding": 0
+    },
+    {
+      "description": "Underflow Vector PACKED_BIT",
+      "valid": false,
+      "vector": [-1],
+      "dtype_hex": "0x10",
+      "dtype_alias": "PACKED_BIT",
+      "padding": 0
+    }
+  ]
+}
+
diff --git a/source/bson-binary-vector/tests/vector-test-cases.json b/source/bson-binary-vector/tests/vector-test-cases.json
deleted file mode 100644
index ffd322a9ab..0000000000
--- a/source/bson-binary-vector/tests/vector-test-cases.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  "description": "Basic Tests of Binary Vectors, subtype 9",
-  "test_key": "vector",
-  "tests": [
-    {
-      "description": "Simple Vector INT8",
-      "valid": true,
-      "vector": [127, 7],
-      "dtype_hex": "0x03",
-      "dtype_alias": "INT8",
-      "padding": 0,
-      "canonical_bson": "1600000005766563746F7200040000000903007F0700",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"AwB/Bw==\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Simple Vector FLOAT32",
-      "valid": true,
-      "vector": [127.0, 7.0],
-      "dtype_hex": "0x27",
-      "dtype_alias": "FLOAT32",
-      "padding": 0,
-      "canonical_bson": "1C00000005766563746F72000A0000000927000000FE420000E04000", 
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwAAAP5CAADgQA==\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Simple Vector PACKED_BIT",
-      "valid": true,
-      "vector": [127, 7],
-      "dtype_hex": "0x10",
-      "dtype_alias": "PACKED_BIT",
-      "padding": 0,
-      "canonical_bson": "1600000005766563746F7200040000000910007F0700",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAB/Bw==\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Empty Vector INT8",
-      "valid": true,
-      "vector": [],
-      "dtype_hex": "0x03",
-      "dtype_alias": "INT8",
-      "padding": 0,
-      "canonical_bson": "1400000005766563746F72000200000009030000",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"AwA=\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Empty Vector FLOAT32",
-      "valid": true,
-      "vector": [],
-      "dtype_hex": "0x27",
-      "dtype_alias": "FLOAT32",
-      "padding": 0,
-      "canonical_bson": "1400000005766563746F72000200000009270000",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwA=\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Empty Vector PACKED_BIT",
-      "valid": true,
-      "vector": [],
-      "dtype_hex": "0x10",
-      "dtype_alias": "PACKED_BIT",
-      "padding": 0,
-      "canonical_bson": "1400000005766563746F72000200000009100000",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAA=\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "Infinity Vector FLOAT32",
-      "valid": true,
-      "vector": ["-inf", 0.0, "inf"],
-      "dtype_hex": "0x27",
-      "dtype_alias": "FLOAT32",
-      "padding": 0,
-      "canonical_bson": "2000000005766563746F72000E000000092700000080FF000000000000807F00",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"JwAAAID/AAAAAAAAgH8=\", \"subType\": \"09\"}}}"
-    },
-    {
-      "description": "PACKED_BIT with padding",
-      "valid": true,
-      "vector": [127, 7],
-      "dtype_hex": "0x10",
-      "dtype_alias": "PACKED_BIT",
-      "padding": 3,
-      "canonical_bson": "1600000005766563746F7200040000000910037F0700",
-      "canonical_extjson": "{\"vector\": {\"$binary\": {\"base64\": \"EAN/Bw==\", \"subType\": \"09\"}}}"
-    }
-  ],
-  "invalid": [
-    {
-      "description": "Overflow Vector INT8",
-      "valid": false,
-      "vector": [256],
-      "dtype_hex": "0x03",
-      "dtype_alias": "INT8",
-      "padding": 0
-    },
-    {
-      "description": "Overflow Vector PACKED_BIT",
-      "valid": false,
-      "vector": [256],
-      "dtype_hex": "0x10",
-      "dtype_alias": "PACKED_BIT",
-      "padding": 0
-    },
-    {
-      "description": "Underflow Vector INT8",
-      "valid": false,
-      "vector": [-1],
-      "dtype_hex": "0x03",
-      "dtype_alias": "INT8",
-      "padding": 0
-    },
-    {
-      "description": "Underflow Vector PACKED_BIT",
-      "valid": false,
-      "vector": [-1],
-      "dtype_hex": "0x10",
-      "dtype_alias": "PACKED_BIT",
-      "padding": 0
-    },
-    {
-      "description": "INT8 with padding",
-      "valid": false,
-      "vector": [127, 7],
-      "dtype_hex": "0x03",
-      "dtype_alias": "INT8",
-      "padding": 3
-    },
-    {
-      "description": "FLOAT32 with padding",
-      "valid": false,
-      "vector": [127.0, 7.0],
-      "dtype_hex": "0x27",
-      "dtype_alias": "FLOAT32",
-      "padding": 3
-    },
-    {
-      "description": "INT8 with float inputs",
-      "valid": false,
-      "vector": [127.77, 7.77],
-      "dtype_hex": "0x27",
-      "dtype_alias": "INT8",
-      "padding": 0
-    }
-  ]
-}
-