diff --git a/config/vectors.json b/config/vectors.json
index 12b588e..3705f73 100644
--- a/config/vectors.json
+++ b/config/vectors.json
@@ -6,38 +6,38 @@
       "credentials": {
         "create": {
           "1.1": {
-            "credential": "./fixtures/license/1.1/credential.json",
-            "mandatoryPointers": "./fixtures/license/1.1/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/1.1/selectivePointers.json"
+            "credential": "./fixtures/1.1/credential.json",
+            "mandatoryPointers": "./fixtures/1.1/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/1.1/selectivePointers.json"
           },
           "2.0": {
-            "credential": "./fixtures/license/2.0/credential.json",
-            "mandatoryPointers": "./fixtures/license/2.0/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/2.0/selectivePointers.json"
+            "credential": "./fixtures/2.0/credential.json",
+            "mandatoryPointers": "./fixtures/2.0/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/2.0/selectivePointers.json"
           }
         },
         "verify": {
           "1.1": {
-            "credential": "./fixtures/license/1.1/credential.json",
-            "mandatoryPointers": "./fixtures/license/1.1/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/1.1/selectivePointers.json"
+            "credential": "./fixtures/1.1/credential.json",
+            "mandatoryPointers": "./fixtures/1.1/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/1.1/selectivePointers.json"
           },
           "2.0": {
-            "credential": "./fixtures/license/2.0/credential.json",
-            "mandatoryPointers": "./fixtures/license/2.0/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/2.0/selectivePointers.json"
+            "credential": "./fixtures/2.0/credential.json",
+            "mandatoryPointers": "./fixtures/2.0/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/2.0/selectivePointers.json"
           }
         },
         "interop": {
           "1.1": {
-            "credential": "./fixtures/license/1.1/credential.json",
-            "mandatoryPointers": "./fixtures/license/1.1/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/1.1/selectivePointers.json"
+            "credential": "./fixtures/1.1/credential.json",
+            "mandatoryPointers": "./fixtures/1.1/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/1.1/selectivePointers.json"
           },
           "2.0": {
-            "credential": "./fixtures/license/2.0/credential.json",
-            "mandatoryPointers": "./fixtures/license/2.0/mandatoryPointers.json",
-            "selectivePointers": "./fixtures/license/2.0/selectivePointers.json"
+            "credential": "./fixtures/2.0/credential.json",
+            "mandatoryPointers": "./fixtures/2.0/mandatoryPointers.json",
+            "selectivePointers": "./fixtures/2.0/selectivePointers.json"
           }
         }
       }
diff --git a/tests/fixtures/1.1/credential.json b/tests/fixtures/1.1/credential.json
new file mode 100644
index 0000000..86b0e32
--- /dev/null
+++ b/tests/fixtures/1.1/credential.json
@@ -0,0 +1,16 @@
+{
+  "@context": [
+    "https://www.w3.org/2018/credentials/v1",
+    {
+      "name": "https://schema.org/name",
+      "description": "https://schema.org/description"
+    }
+  ],
+  "id": "urn:uuid:36245ee9-9074-4b05-a777-febff2e69757",
+  "type": ["VerifiableCredential"],
+  "credentialSubject": {
+    "id": "urn:uuid:1a0e4ef5-091f-4060-842e-18e519ab9440",
+    "name": "Alice",
+    "description": "A credential about Alice."
+  }
+}
diff --git a/tests/fixtures/license/2.0/mandatoryPointers.json b/tests/fixtures/1.1/mandatoryPointers.json
similarity index 100%
rename from tests/fixtures/license/2.0/mandatoryPointers.json
rename to tests/fixtures/1.1/mandatoryPointers.json
diff --git a/tests/fixtures/1.1/selectivePointers.json b/tests/fixtures/1.1/selectivePointers.json
new file mode 100644
index 0000000..8e0db27
--- /dev/null
+++ b/tests/fixtures/1.1/selectivePointers.json
@@ -0,0 +1,3 @@
+[
+  "/credentialSubject/name"
+]
diff --git a/tests/fixtures/2.0/credential.json b/tests/fixtures/2.0/credential.json
new file mode 100644
index 0000000..b485e69
--- /dev/null
+++ b/tests/fixtures/2.0/credential.json
@@ -0,0 +1,12 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/credentials/v2"
+  ],
+  "id": "urn:uuid:36245ee9-9074-4b05-a777-febff2e69757",
+  "type": ["VerifiableCredential"],
+  "credentialSubject": {
+    "id": "urn:uuid:1a0e4ef5-091f-4060-842e-18e519ab9440",
+    "name": "Alice",
+    "description": "A credential about Alice."
+  }
+}
diff --git a/tests/fixtures/2.0/mandatoryPointers.json b/tests/fixtures/2.0/mandatoryPointers.json
new file mode 100644
index 0000000..3f5dc00
--- /dev/null
+++ b/tests/fixtures/2.0/mandatoryPointers.json
@@ -0,0 +1,3 @@
+[
+  "/issuer"
+]
diff --git a/tests/fixtures/2.0/selectivePointers.json b/tests/fixtures/2.0/selectivePointers.json
new file mode 100644
index 0000000..8e0db27
--- /dev/null
+++ b/tests/fixtures/2.0/selectivePointers.json
@@ -0,0 +1,3 @@
+[
+  "/credentialSubject/name"
+]
diff --git a/tests/fixtures/license/1.1/credential.json b/tests/fixtures/license/1.1/credential.json
deleted file mode 100644
index efcab4f..0000000
--- a/tests/fixtures/license/1.1/credential.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/2018/credentials/v1",
-    "https://w3id.org/vdl/v2"
-  ],
-  "id": "urn:uuid:36245ee9-9074-4b05-a777-febff2e69757",
-  "type": ["VerifiableCredential", "Iso18013DriversLicenseCredential"],
-  "credentialSubject": {
-    "id": "urn:uuid:1a0e4ef5-091f-4060-842e-18e519ab9440",
-    "type": "LicensedDriver",
-    "driversLicense": {
-      "type": "Iso18013DriversLicense",
-      "document_number": "T21387yc328c7y32h23f23",
-      "birth_date": "01-01-1990",
-      "expiry_date": "01-01-2030",
-      "issuing_authority": "VA"
-    }
-  }
-}
diff --git a/tests/fixtures/license/1.1/mandatoryPointers.json b/tests/fixtures/license/1.1/mandatoryPointers.json
deleted file mode 100644
index e8a2f32..0000000
--- a/tests/fixtures/license/1.1/mandatoryPointers.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "/issuanceDate",
-  "/issuer"
-]
diff --git a/tests/fixtures/license/1.1/selectivePointers.json b/tests/fixtures/license/1.1/selectivePointers.json
deleted file mode 100644
index 80f5c81..0000000
--- a/tests/fixtures/license/1.1/selectivePointers.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  "/credentialSubject/driversLicense/document_number",
-  "/credentialSubject/driversLicense/birth_date",
-  "/credentialSubject/driversLicense/expiry_date",
-  "/credentialSubject/driversLicense/issuing_authority"
-]
diff --git a/tests/fixtures/license/2.0/credential.json b/tests/fixtures/license/2.0/credential.json
deleted file mode 100644
index 19e5f0a..0000000
--- a/tests/fixtures/license/2.0/credential.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/credentials/v2",
-    "https://w3id.org/vdl/v2"
-  ],
-  "id": "urn:uuid:36245ee9-9074-4b05-a777-febff2e69757",
-  "type": ["VerifiableCredential", "Iso18013DriversLicenseCredential"],
-  "credentialSubject": {
-    "id": "urn:uuid:1a0e4ef5-091f-4060-842e-18e519ab9440",
-    "type": "LicensedDriver",
-    "driversLicense": {
-      "type": "Iso18013DriversLicense",
-      "document_number": "T21387yc328c7y32h23f23",
-      "birth_date": "01-01-1990",
-      "expiry_date": "01-01-2030",
-      "issuing_authority": "VA"
-    }
-  }
-}
diff --git a/tests/fixtures/license/2.0/selectivePointers.json b/tests/fixtures/license/2.0/selectivePointers.json
deleted file mode 100644
index 80f5c81..0000000
--- a/tests/fixtures/license/2.0/selectivePointers.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  "/credentialSubject/driversLicense/document_number",
-  "/credentialSubject/driversLicense/birth_date",
-  "/credentialSubject/driversLicense/expiry_date",
-  "/credentialSubject/driversLicense/issuing_authority"
-]