diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.json b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
deleted file mode 100644
index 53b39ad039535acf75556b94cf677d7fdb704880..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 2165747
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 642779136
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 3065524739
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 21,
-  "id": "family"
-}
-
-{
-  "return": 16,
-  "id": "model"
-}
-
-{
-  "return": 1,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD A10-5800K APU with Radeon(tm) HD Graphics  ",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
deleted file mode 100644
index 156b7724824802b9dc5e28f3d2426d37fb952416..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
deleted file mode 100644
index 6dc2a803afa41c26c600baf52c885c5b821f3798..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "       Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
deleted file mode 100644
index e715ca082abcf8aa4a277b21cf13c3d88917af6a..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 4027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 60,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i5-4670T CPU @ 2.30GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
deleted file mode 100644
index da296f945abfea8b7bc190153b706a5f3cc2504b..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 15
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10244027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369155
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 94,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i5-6600 CPU @ 3.30GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
deleted file mode 100644
index dd354490021926b645f682a37aa90666ec7cc811..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545558019
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 42,
-  "id": "model"
-}
-
-{
-  "return": 7,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
deleted file mode 100644
index 2b1349f17f4ae61e0119f70e1f1ac0db65dd1859..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 643
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4156170787
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 58,
-  "id": "model"
-}
-
-{
-  "return": 9,
-  "id": "stepping"
-}
-
-{
-  "return": "      Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
deleted file mode 100644
index d83e7788b1b69e420e0cd79f8e65c87676da1967..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 643
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4156170755
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 58,
-  "id": "model"
-}
-
-{
-  "return": 9,
-  "id": "stepping"
-}
-
-{
-  "return": "        Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
deleted file mode 100644
index 2b15fadfdc8f60876b574754f33d31546c10e3c8..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1963
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 69,
-  "id": "model"
-}
-
-{
-  "return": 1,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
deleted file mode 100644
index b570d46b7babb514ef7982e7da7e9a2721baa049..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1839035
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 61,
-  "id": "model"
-}
-
-{
-  "return": 4,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
deleted file mode 100644
index 44be368f74a29cf6c4a5d6ec952778fd6702b356..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 537921536
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2166366721
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 15,
-  "id": "model"
-}
-
-{
-  "return": 11,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Core(TM)2 Duo CPU     E6850  @ 3.00GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
deleted file mode 100644
index 79b5afad077245b712204545adbc14115547b412..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1015
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 3864004608
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2174754817
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 16,
-  "id": "family"
-}
-
-{
-  "return": 2,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Quad-Core AMD Opteron(tm) Processor 2350",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
deleted file mode 100644
index 0df386076644c96dee7869cec9ff96c1d48187b8..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 68595
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 668204031
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2545426947
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 21,
-  "id": "family"
-}
-
-{
-  "return": 1,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD Opteron(TM) Processor 6234                 ",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
deleted file mode 100644
index 5f5badda9ea17e1bdb1db193156dec1b0c4a3a40..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 9
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1011
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 3862956032
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2157977601
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 126614527
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 16,
-  "id": "family"
-}
-
-{
-  "return": 4,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "AMD Phenom(tm) II X4 B95 Processor",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
deleted file mode 100644
index 10fbe069ffe9160e72fcfdb2d1f84a5916a0c9fa..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 6,
-      "features": 4
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 7
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 289
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 10244027
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 94,
-  "id": "model"
-}
-
-{
-  "return": 3,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
deleted file mode 100644
index f1affa46baefd75507b647bc34f63dc262c5201b..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1963
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369155
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 63,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
deleted file mode 100644
index 2cd15f64b5b70461bc844b4de7bbb692fbbf9c89..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 33
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 1961
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 4160369187
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 63,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
deleted file mode 100644
index a8846132e3135f724b4109553113c5ddad46a861..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 739248128
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2210013699
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 47,
-  "id": "model"
-}
-
-{
-  "return": 2,
-  "id": "stepping"
-}
-
-{
-  "return": "       Intel(R) Xeon(R) CPU E7- 4820  @ 2.00GHz",
-  "id": "model-id"
-}
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
deleted file mode 100644
index c75594d4e6b2cd0845d89898bd31762110e28b64..0000000000000000000000000000000000000000
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "return": [
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-ecx": 1,
-      "cpuid-input-eax": 13,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483658,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EAX",
-      "cpuid-input-eax": 1073741825,
-      "features": 16777467
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 3221225473,
-      "features": 0
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483655,
-      "features": 0
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 2147483649,
-      "features": 1
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 2147483649,
-      "features": 672139264
-    },
-    {
-      "cpuid-register": "EBX",
-      "cpuid-input-ecx": 0,
-      "cpuid-input-eax": 7,
-      "features": 2
-    },
-    {
-      "cpuid-register": "ECX",
-      "cpuid-input-eax": 1,
-      "features": 2159550977
-    },
-    {
-      "cpuid-register": "EDX",
-      "cpuid-input-eax": 1,
-      "features": 260832255
-    }
-  ],
-  "id": "feature-words"
-}
-
-{
-  "return": 6,
-  "id": "family"
-}
-
-{
-  "return": 26,
-  "id": "model"
-}
-
-{
-  "return": 5,
-  "id": "stepping"
-}
-
-{
-  "return": "Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz",
-  "id": "model-id"
-}