diff --git a/src/test/resources/ebsi/trusted-issuer-chain/TAOVerifiableAccreditation.json b/src/test/resources/ebsi/trusted-issuer-chain/TAOVerifiableAccreditation.json
index 4169b40d..05dd25fd 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/TAOVerifiableAccreditation.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/TAOVerifiableAccreditation.json
@@ -28,6 +28,18 @@
             },
             {
                 "authorisedSchemaId": "https://essif.europa.eu/tsr-123/verifiable-accreditation-ti-diploma.json"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit/feat-neom-credential-schemas/src/test/resources/schemas/NEOM/PregnancyCertificate.json"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit-vclib/master/src/test/resources/schemas/Europass.json"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit/feat-neom-credential-schemas/src/test/resources/schemas/NEOM/StudentCard.json"
+            },
+            {
+                "authorisedSchemaId": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/0x4dd3926cd92bb3cb64fa6c837539ed31fc30dd38a11266a91678efa7268cde09"
             }
         ]
     },
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/TIVerifiableAccreditationTIDiploma.json b/src/test/resources/ebsi/trusted-issuer-chain/TIVerifiableAccreditationTIDiploma.json
index d2c9d7ed..aa1f4651 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/TIVerifiableAccreditationTIDiploma.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/TIVerifiableAccreditationTIDiploma.json
@@ -43,6 +43,18 @@
                     }
                 ],
                 "reviewDate": "2024-04-22T14:11:44Z"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit/feat-neom-credential-schemas/src/test/resources/schemas/NEOM/PregnancyCertificate.json"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit-vclib/master/src/test/resources/schemas/Europass.json"
+            },
+            {
+                "authorisedSchemaId": "https://raw.githubusercontent.com/walt-id/waltid-ssikit/feat-neom-credential-schemas/src/test/resources/schemas/NEOM/StudentCard.json"
+            },
+            {
+                "authorisedSchemaId": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/0x4dd3926cd92bb3cb64fa6c837539ed31fc30dd38a11266a91678efa7268cde09"
             }
         ]
     },
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/VerifiableDiploma.json b/src/test/resources/ebsi/trusted-issuer-chain/VerifiableDiploma.json
index 54789978..dba2a888 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/VerifiableDiploma.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/VerifiableDiploma.json
@@ -1,7 +1,7 @@
 {
   "@context": ["https://www.w3.org/2018/credentials/v1"],
   "credentialSchema": {
-    "id": "https://raw.githubusercontent.com/walt-id/waltid-ssikit-vclib/master/src/test/resources/schemas/VerifiableDiploma.json",
+    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/0x4dd3926cd92bb3cb64fa6c837539ed31fc30dd38a11266a91678efa7268cde09",
     "type": "JsonSchemaValidator2018"
   },
   "credentialStatus": {
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-attribute.json b/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-attribute.json
index 9f59e1ac..a79cd444 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-attribute.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-attribute.json
@@ -1,10 +1,10 @@
 {
-    "did": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
+    "did": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
     "attribute": {
-        "hash": "96125e8d71c78f5cd528d8a31ea5c20199b64af31301e292daee05343d587de9",
-        "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo0MjY1MGM4MC01ZDI5LTQ2OGQtOTg5NC0zNzIwZmFkZTY1N2YiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwiaXNzdWVkIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24uanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiJ9XX0sInRlcm1zT2ZVc2UiOlt7InR5cGUiOiJWZXJpZmlhYmxlQWNjcmVkaXRhdGlvbiIsImlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9tYWluL3NyYy90ZXN0L3Jlc291cmNlcy9lYnNpL3RydXN0ZWQtaXNzdWVyLWNoYWluL3Rhby10aXItYXR0cmlidXRlLmpzb24ifV0sImNyZWRlbnRpYWxTdGF0dXMiOnsiaWQiOiJodHRwczovL2Vzc2lmLmV1cm9wYS5ldS9zdGF0dXMvNDUiLCJ0eXBlIjoiQ3JlZGVudGlhbFN0YXR1c0xpc3QyMDIwIn19LCJqdGkiOiJ1cm46dXVpZDo0MjY1MGM4MC01ZDI5LTQ2OGQtOTg5NC0zNzIwZmFkZTY1N2YifQ.ju-ElAIb187raydtWnhemvpbJVozAianBUFU_l9E8PdnQ_gxrnBHoFvbok5PhbyVHHk1c90iDVnju6d6-cnRrQ",
+        "hash": "9818bb4caab6742d74de0a4f9c6fa43792583f3edc3068ce42ac114dded26aed",
+        "body": "eyJraWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSMyNWU0ZmUxMGQ5ZTA0NTZiOGFjMDEwZjE5ZWQ1ZWMwZiIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsIm5iZiI6MTY4MTgwODA2NywiaXNzIjoiZGlkOmVic2k6emZWeGZqQlFXWlRBSDVGZWpXb3hUYUUiLCJpYXQiOjE2ODE4MDgwNjcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDozOWUyMTIzNS05YzczLTQ1MjYtYjk4ZC1lZmIxZWI1YzU0ODkiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMThUMDg6NTQ6MjdaIiwiaXNzdWVkIjoiMjAyMy0wNC0xOFQwODo1NDoyN1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTE4VDA4OjU0OjI3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24uanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9mZWF0LW5lb20tY3JlZGVudGlhbC1zY2hlbWFzL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL05FT00vUHJlZ25hbmN5Q2VydGlmaWNhdGUuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvRXVyb3Bhc3MuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9mZWF0LW5lb20tY3JlZGVudGlhbC1zY2hlbWFzL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL05FT00vU3R1ZGVudENhcmQuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9hcGktcGlsb3QuZWJzaS5ldS90cnVzdGVkLXNjaGVtYXMtcmVnaXN0cnkvdjIvc2NoZW1hcy8weDRkZDM5MjZjZDkyYmIzY2I2NGZhNmM4Mzc1MzllZDMxZmMzMGRkMzhhMTEyNjZhOTE2NzhlZmE3MjY4Y2RlMDkifV19LCJ0ZXJtc09mVXNlIjpbeyJ0eXBlIjoiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iLCJpZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvbWFpbi9zcmMvdGVzdC9yZXNvdXJjZXMvZWJzaS90cnVzdGVkLWlzc3Vlci1jaGFpbi90YW8tdGlyLWF0dHJpYnV0ZS5qc29uIn1dLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvc3RhdHVzLzQ1IiwidHlwZSI6IkNyZWRlbnRpYWxTdGF0dXNMaXN0MjAyMCJ9fSwianRpIjoidXJuOnV1aWQ6MzllMjEyMzUtOWM3My00NTI2LWI5OGQtZWZiMWViNWM1NDg5In0.kTn0lULNqN15eVeinLD88UIQQoOR5ME7u4H0Eg2BePtAiVR2lR4YTX4EFntDlofMwcYG09Sup5SyR--QG0Y6vg",
         "issuerType": "TAO",
-        "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-        "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+        "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+        "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
     }
 }
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-record.json b/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-record.json
index da403b82..6ef47aff 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-record.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/tao-tir-record.json
@@ -1,19 +1,19 @@
 {
-    "did": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
+    "did": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
     "attributes": [
         {
             "hash": "e63e295b6e30cbfde26d76f6caf539a5be39f2a928609ebc4d3d6c48e978a71e",
             "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUlkIl0sIkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sImlkIjoidXJuOnV1aWQ6OTg3NmU5OTUtNDljOC00YTE1LTkzMTMtOGRlZGFlZmM3MGFjIiwiaXNzdWVyIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpc3N1YW5jZURhdGUiOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImlzc3VlZCI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwidmFsaWRGcm9tIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJleHBpcmF0aW9uRGF0ZSI6IjIwMjQtMDEtMDFUMDA6MDA6MDBaIiwiY3JlZGVudGlhbFNjaGVtYSI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQtdmNsaWIvbWFzdGVyL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL1ZlcmlmaWFibGVEaXBsb21hLmpzb24iLCJsaW1pdEp1cmlzZGljdGlvbiI6Imh0dHA6Ly9wdWJsaWNhdGlvbnMuZXVyb3BhLmV1L3Jlc291cmNlL2F1dGhvcml0eS9hdHUvTkxEIiwiYWNjcmVkaXRhdGlvblR5cGUiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2FjY3JlZGl0YXRpb24vZTU3ZGRkZmNmMyIsImRlY2lzaW9uIjoiZnVsbHkgY29tcGxpYW50IiwicmVwb3J0IjpbImh0dHBzOi8vd3d3LmV4YW1wbGUuY29tL1VSTHRvcmVwb3J0LnBkZiJdLCJsaW1pdFF1YWxpZmljYXRpb24iOlt7ImlkIjoiaHR0cDovL3F1YWxkYi5vcmcvcXVhbC8xIiwidGl0bGUiOiJNYXN0ZXJzJyBEaXBsb21hIGluIFNvY2lvbG9neSIsImFsdGVybmF0aXZlTGFiZWwiOlsiRGlwbG9tYSBpbiBTb2Npb2xvZ3kiLCJNYXN0ZXJzJyBEaXBsb21hIGluIFNvY2lvbG9naWNhbCBTdHVkaWVzIl0sIkVRRkxldmVsIjoiaHR0cDovL2RhdGEuZXVyb3BhLmV1L3NuYi9lcWYvNiIsIk5RRkxldmVsIjoiaHR0cDovL2RhdGEuZXVyb3BhLmV1L3NuYi9xZHIvY18xNzExYTA2MSJ9XSwicmV2aWV3RGF0ZSI6IjIwMjQtMDQtMjJUMTQ6MTE6NDRaIn1dfSwidGVybXNPZlVzZSI6W3sidHlwZSI6IlZlcmlmaWFibGVBY2NyZWRpdGF0aW9uIiwiaWQiOiJodHRwczovL3Jhdy5naXRodWJ1c2VyY29udGVudC5jb20vd2FsdC1pZC93YWx0aWQtc3Npa2l0L21haW4vc3JjL3Rlc3QvcmVzb3VyY2VzL2Vic2kvdHJ1c3RlZC1pc3N1ZXItY2hhaW4vdGFvLXRpci1hdHRyaWJ1dGUuanNvbiJ9XSwiY3JlZGVudGlhbFN0YXR1cyI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3N0YXR1cy80NSIsInR5cGUiOiJDcmVkZW50aWFsc1N0YXR1c0xpc3QyMDIwIn19LCJqdGkiOiJ1cm46dXVpZDo5ODc2ZTk5NS00OWM4LTRhMTUtOTMxMy04ZGVkYWVmYzcwYWMifQ.hciEdzOaQiUSmtKloN6r5vlt-I_4n8yUPY8setrZzDylRV4ZsW1QQJsVm8AatDcYJVmNSkApVXlClRzzO_GLCA",
             "issuerType": "TI",
-            "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-            "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+            "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+            "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
         },
         {
-            "hash": "96125e8d71c78f5cd528d8a31ea5c20199b64af31301e292daee05343d587de9",
-            "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo0MjY1MGM4MC01ZDI5LTQ2OGQtOTg5NC0zNzIwZmFkZTY1N2YiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwiaXNzdWVkIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24uanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiJ9XX0sInRlcm1zT2ZVc2UiOlt7InR5cGUiOiJWZXJpZmlhYmxlQWNjcmVkaXRhdGlvbiIsImlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9tYWluL3NyYy90ZXN0L3Jlc291cmNlcy9lYnNpL3RydXN0ZWQtaXNzdWVyLWNoYWluL3Rhby10aXItYXR0cmlidXRlLmpzb24ifV0sImNyZWRlbnRpYWxTdGF0dXMiOnsiaWQiOiJodHRwczovL2Vzc2lmLmV1cm9wYS5ldS9zdGF0dXMvNDUiLCJ0eXBlIjoiQ3JlZGVudGlhbFN0YXR1c0xpc3QyMDIwIn19LCJqdGkiOiJ1cm46dXVpZDo0MjY1MGM4MC01ZDI5LTQ2OGQtOTg5NC0zNzIwZmFkZTY1N2YifQ.ju-ElAIb187raydtWnhemvpbJVozAianBUFU_l9E8PdnQ_gxrnBHoFvbok5PhbyVHHk1c90iDVnju6d6-cnRrQ",
+            "hash": "9818bb4caab6742d74de0a4f9c6fa43792583f3edc3068ce42ac114dded26aed",
+            "body": "eyJraWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSMyNWU0ZmUxMGQ5ZTA0NTZiOGFjMDEwZjE5ZWQ1ZWMwZiIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsIm5iZiI6MTY4MTgwODA2NywiaXNzIjoiZGlkOmVic2k6emZWeGZqQlFXWlRBSDVGZWpXb3hUYUUiLCJpYXQiOjE2ODE4MDgwNjcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDozOWUyMTIzNS05YzczLTQ1MjYtYjk4ZC1lZmIxZWI1YzU0ODkiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMThUMDg6NTQ6MjdaIiwiaXNzdWVkIjoiMjAyMy0wNC0xOFQwODo1NDoyN1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTE4VDA4OjU0OjI3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24uanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9mZWF0LW5lb20tY3JlZGVudGlhbC1zY2hlbWFzL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL05FT00vUHJlZ25hbmN5Q2VydGlmaWNhdGUuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvRXVyb3Bhc3MuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC9mZWF0LW5lb20tY3JlZGVudGlhbC1zY2hlbWFzL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL05FT00vU3R1ZGVudENhcmQuanNvbiJ9LHsiYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9hcGktcGlsb3QuZWJzaS5ldS90cnVzdGVkLXNjaGVtYXMtcmVnaXN0cnkvdjIvc2NoZW1hcy8weDRkZDM5MjZjZDkyYmIzY2I2NGZhNmM4Mzc1MzllZDMxZmMzMGRkMzhhMTEyNjZhOTE2NzhlZmE3MjY4Y2RlMDkifV19LCJ0ZXJtc09mVXNlIjpbeyJ0eXBlIjoiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iLCJpZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvbWFpbi9zcmMvdGVzdC9yZXNvdXJjZXMvZWJzaS90cnVzdGVkLWlzc3Vlci1jaGFpbi90YW8tdGlyLWF0dHJpYnV0ZS5qc29uIn1dLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvc3RhdHVzLzQ1IiwidHlwZSI6IkNyZWRlbnRpYWxTdGF0dXNMaXN0MjAyMCJ9fSwianRpIjoidXJuOnV1aWQ6MzllMjEyMzUtOWM3My00NTI2LWI5OGQtZWZiMWViNWM1NDg5In0.kTn0lULNqN15eVeinLD88UIQQoOR5ME7u4H0Eg2BePtAiVR2lR4YTX4EFntDlofMwcYG09Sup5SyR--QG0Y6vg",
             "issuerType": "TAO",
-            "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-            "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+            "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+            "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
         }
     ]
 }
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-attribute.json b/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-attribute.json
index 10b67db3..a3ae400d 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-attribute.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-attribute.json
@@ -1,10 +1,10 @@
 {
-    "did": "did:ebsi:zkRop63wCiVgHxn5yBb5AXf",
+    "did": "did:ebsi:zrCaMa5923UdhhWA69hArZS",
     "attribute": {
-        "hash": "36de108ac3a3a435cfd829d1809c87af2b5b8e954ce7d29229b4e742650e45cf",
-        "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6eWRXQ3NaeHZUOXRTMmNUY1U5d3R3RSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb25USURpcGxvbWEiXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo5YWNkNzE3YS04NzBlLTQ3NDctOTUxNy1lMDE5MGVkYjg1MTYiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwiaXNzdWVkIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24tdGktZGlwbG9tYS5qc29uIiwidHlwZSI6IkZ1bGxKc29uU2NoZW1hVmFsaWRhdG9yMjAyMSJ9LCJjcmVkZW50aWFsU3ViamVjdCI6eyJpZCI6ImRpZDplYnNpOnp5ZFdDc1p4dlQ5dFMyY1RjVTl3dHdFIiwiYXV0aG9yaXNhdGlvbkNsYWltcyI6W3siYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvVmVyaWZpYWJsZURpcGxvbWEuanNvbiIsImxpbWl0SnVyaXNkaWN0aW9uIjoiaHR0cDovL3B1YmxpY2F0aW9ucy5ldXJvcGEuZXUvcmVzb3VyY2UvYXV0aG9yaXR5L2F0dS9OTEQiLCJhY2NyZWRpdGF0aW9uVHlwZSI6Imh0dHA6Ly9kYXRhLmV1cm9wYS5ldS9zbmIvYWNjcmVkaXRhdGlvbi9lNTdkZGRmY2YzIiwiZGVjaXNpb24iOiJmdWxseSBjb21wbGlhbnQiLCJyZXBvcnQiOlsiaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vVVJMdG9yZXBvcnQucGRmIl0sImxpbWl0UXVhbGlmaWNhdGlvbiI6W3siaWQiOiJodHRwOi8vcXVhbGRiLm9yZy9xdWFsLzEiLCJ0aXRsZSI6Ik1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2d5IiwiYWx0ZXJuYXRpdmVMYWJlbCI6WyJEaXBsb21hIGluIFNvY2lvbG9neSIsIk1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2dpY2FsIFN0dWRpZXMiXSwiRVFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2VxZi82IiwiTlFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL3Fkci9jXzE3MTFhMDYxIn1dLCJyZXZpZXdEYXRlIjoiMjAyNC0wNC0yMlQxNDoxMTo0NFoifV19LCJ0ZXJtc09mVXNlIjpbeyJ0eXBlIjoiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iLCJpZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvbWFpbi9zcmMvdGVzdC9yZXNvdXJjZXMvZWJzaS90cnVzdGVkLWlzc3Vlci1jaGFpbi90YW8tdGlyLWF0dHJpYnV0ZS5qc29uIn1dLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvc3RhdHVzLzQ1IiwidHlwZSI6IkNyZWRlbnRpYWxTdGF0dXNMaXN0MjAyMCJ9fSwianRpIjoidXJuOnV1aWQ6OWFjZDcxN2EtODcwZS00NzQ3LTk1MTctZTAxOTBlZGI4NTE2In0.CkAXYfkvd7eQztRopJEdPWBfwIEFyd721QHHGDySxYa34WTk-AOI3GTYxLS5OaNw3kusHaBOPS8x42Kq6YNKtg",
+        "hash": "bffc44de220689d9f14dbe7bbe35d6c4393156b80cc56b3d27f55788625e54f6",
+        "body": "eyJraWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSMyNWU0ZmUxMGQ5ZTA0NTZiOGFjMDEwZjE5ZWQ1ZWMwZiIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6ckNhTWE1OTIzVWRoaFdBNjloQXJaUyIsIm5iZiI6MTY4MTgwODA2NiwiaXNzIjoiZGlkOmVic2k6emZWeGZqQlFXWlRBSDVGZWpXb3hUYUUiLCJpYXQiOjE2ODE4MDgwNjYsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb25USURpcGxvbWEiXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo1ZGQ2NzFjMi04YWQ4LTRhNGYtODUzNy00OGQ3ZWI5OTQxZTEiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMThUMDg6NTQ6MjZaIiwiaXNzdWVkIjoiMjAyMy0wNC0xOFQwODo1NDoyNloiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTE4VDA4OjU0OjI2WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24tdGktZGlwbG9tYS5qc29uIiwidHlwZSI6IkZ1bGxKc29uU2NoZW1hVmFsaWRhdG9yMjAyMSJ9LCJjcmVkZW50aWFsU3ViamVjdCI6eyJpZCI6ImRpZDplYnNpOnpyQ2FNYTU5MjNVZGhoV0E2OWhBclpTIiwiYXV0aG9yaXNhdGlvbkNsYWltcyI6W3siYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvVmVyaWZpYWJsZURpcGxvbWEuanNvbiIsImxpbWl0SnVyaXNkaWN0aW9uIjoiaHR0cDovL3B1YmxpY2F0aW9ucy5ldXJvcGEuZXUvcmVzb3VyY2UvYXV0aG9yaXR5L2F0dS9OTEQiLCJhY2NyZWRpdGF0aW9uVHlwZSI6Imh0dHA6Ly9kYXRhLmV1cm9wYS5ldS9zbmIvYWNjcmVkaXRhdGlvbi9lNTdkZGRmY2YzIiwiZGVjaXNpb24iOiJmdWxseSBjb21wbGlhbnQiLCJyZXBvcnQiOlsiaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vVVJMdG9yZXBvcnQucGRmIl0sImxpbWl0UXVhbGlmaWNhdGlvbiI6W3siaWQiOiJodHRwOi8vcXVhbGRiLm9yZy9xdWFsLzEiLCJ0aXRsZSI6Ik1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2d5IiwiYWx0ZXJuYXRpdmVMYWJlbCI6WyJEaXBsb21hIGluIFNvY2lvbG9neSIsIk1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2dpY2FsIFN0dWRpZXMiXSwiRVFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2VxZi82IiwiTlFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL3Fkci9jXzE3MTFhMDYxIn1dLCJyZXZpZXdEYXRlIjoiMjAyNC0wNC0yMlQxNDoxMTo0NFoifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvZmVhdC1uZW9tLWNyZWRlbnRpYWwtc2NoZW1hcy9zcmMvdGVzdC9yZXNvdXJjZXMvc2NoZW1hcy9ORU9NL1ByZWduYW5jeUNlcnRpZmljYXRlLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQtdmNsaWIvbWFzdGVyL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL0V1cm9wYXNzLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvZmVhdC1uZW9tLWNyZWRlbnRpYWwtc2NoZW1hcy9zcmMvdGVzdC9yZXNvdXJjZXMvc2NoZW1hcy9ORU9NL1N0dWRlbnRDYXJkLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vYXBpLXBpbG90LmVic2kuZXUvdHJ1c3RlZC1zY2hlbWFzLXJlZ2lzdHJ5L3YyL3NjaGVtYXMvMHg0ZGQzOTI2Y2Q5MmJiM2NiNjRmYTZjODM3NTM5ZWQzMWZjMzBkZDM4YTExMjY2YTkxNjc4ZWZhNzI2OGNkZTA5In1dfSwidGVybXNPZlVzZSI6W3sidHlwZSI6IlZlcmlmaWFibGVBY2NyZWRpdGF0aW9uIiwiaWQiOiJodHRwczovL3Jhdy5naXRodWJ1c2VyY29udGVudC5jb20vd2FsdC1pZC93YWx0aWQtc3Npa2l0L21haW4vc3JjL3Rlc3QvcmVzb3VyY2VzL2Vic2kvdHJ1c3RlZC1pc3N1ZXItY2hhaW4vdGFvLXRpci1hdHRyaWJ1dGUuanNvbiJ9XSwiY3JlZGVudGlhbFN0YXR1cyI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3N0YXR1cy80NSIsInR5cGUiOiJDcmVkZW50aWFsU3RhdHVzTGlzdDIwMjAifX0sImp0aSI6InVybjp1dWlkOjVkZDY3MWMyLThhZDgtNGE0Zi04NTM3LTQ4ZDdlYjk5NDFlMSJ9.YViBcEHN7wVs5aMtpPDmLOAWgD_v8MSTKr2iSBqTKJF5sVhn_a1o1DTMDHfBU7bFHI4PI7tVBStHdwB1Urks5w",
         "issuerType": "TI",
-        "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-        "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+        "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+        "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
     }
 }
diff --git a/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-record.json b/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-record.json
index 6510501b..923516fa 100644
--- a/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-record.json
+++ b/src/test/resources/ebsi/trusted-issuer-chain/ti-tir-record.json
@@ -1,19 +1,19 @@
 {
-    "did": "did:ebsi:zkRop63wCiVgHxn5yBb5AXf",
+    "did": "did:ebsi:zrCaMa5923UdhhWA69hArZS",
     "attributes": [
         {
             "hash": "5ff9dd92f374d5fa4955a4b9d6e7814889d9d1dd55c6ece023f5f5a6daa28534",
             "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6eWRXQ3NaeHZUOXRTMmNUY1U5d3R3RSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUlkIl0sIkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sImlkIjoidXJuOnV1aWQ6ZDUzZWFmMzctOTA2My00MWEyLThjY2QtNTc4ZmNkMmJhNzM1IiwiaXNzdWVyIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpc3N1YW5jZURhdGUiOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImlzc3VlZCI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwidmFsaWRGcm9tIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJleHBpcmF0aW9uRGF0ZSI6IjIwMjQtMDEtMDFUMDA6MDA6MDBaIiwiY3JlZGVudGlhbFNjaGVtYSI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3Rzci0xMjMvdmVyaWZpYWJsZS1hY2NyZWRpdGF0aW9uLXRpLWRpcGxvbWEuanNvbiIsInR5cGUiOiJGdWxsSnNvblNjaGVtYVZhbGlkYXRvcjIwMjEifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiaWQiOiJkaWQ6ZWJzaTp6eWRXQ3NaeHZUOXRTMmNUY1U5d3R3RSIsImF1dGhvcmlzYXRpb25DbGFpbXMiOlt7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQtdmNsaWIvbWFzdGVyL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL1ZlcmlmaWFibGVEaXBsb21hLmpzb24iLCJsaW1pdEp1cmlzZGljdGlvbiI6Imh0dHA6Ly9wdWJsaWNhdGlvbnMuZXVyb3BhLmV1L3Jlc291cmNlL2F1dGhvcml0eS9hdHUvTkxEIiwiYWNjcmVkaXRhdGlvblR5cGUiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2FjY3JlZGl0YXRpb24vZTU3ZGRkZmNmMyIsImRlY2lzaW9uIjoiZnVsbHkgY29tcGxpYW50IiwicmVwb3J0IjpbImh0dHBzOi8vd3d3LmV4YW1wbGUuY29tL1VSTHRvcmVwb3J0LnBkZiJdLCJsaW1pdFF1YWxpZmljYXRpb24iOlt7ImlkIjoiaHR0cDovL3F1YWxkYi5vcmcvcXVhbC8xIiwidGl0bGUiOiJNYXN0ZXJzJyBEaXBsb21hIGluIFNvY2lvbG9neSIsImFsdGVybmF0aXZlTGFiZWwiOlsiRGlwbG9tYSBpbiBTb2Npb2xvZ3kiLCJNYXN0ZXJzJyBEaXBsb21hIGluIFNvY2lvbG9naWNhbCBTdHVkaWVzIl0sIkVRRkxldmVsIjoiaHR0cDovL2RhdGEuZXVyb3BhLmV1L3NuYi9lcWYvNiIsIk5RRkxldmVsIjoiaHR0cDovL2RhdGEuZXVyb3BhLmV1L3NuYi9xZHIvY18xNzExYTA2MSJ9XSwicmV2aWV3RGF0ZSI6IjIwMjQtMDQtMjJUMTQ6MTE6NDRaIn1dfSwidGVybXNPZlVzZSI6W3sidHlwZSI6IlZlcmlmaWFibGVBY2NyZWRpdGF0aW9uIiwiaWQiOiJodHRwczovL3Jhdy5naXRodWJ1c2VyY29udGVudC5jb20vd2FsdC1pZC93YWx0aWQtc3Npa2l0L21haW4vc3JjL3Rlc3QvcmVzb3VyY2VzL2Vic2kvdHJ1c3RlZC1pc3N1ZXItY2hhaW4vdGFvLXRpci1hdHRyaWJ1dGUuanNvbiJ9XSwiY3JlZGVudGlhbFN0YXR1cyI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3N0YXR1cy80NSIsInR5cGUiOiJDcmVkZW50aWFsc1N0YXR1c0xpc3QyMDIwIn19LCJqdGkiOiJ1cm46dXVpZDpkNTNlYWYzNy05MDYzLTQxYTItOGNjZC01NzhmY2QyYmE3MzUifQ.lbtuFLyvk_mfRSs-TlSpDoyYkxYuOyEajOBSBOw6jsLCuX8j05Mv-F2LhWKCxhirQwglXrYQONVoTZjfDSWuZQ",
             "issuerType": "TI",
-            "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-            "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+            "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+            "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
         },
         {
-            "hash": "36de108ac3a3a435cfd829d1809c87af2b5b8e954ce7d29229b4e742650e45cf",
-            "body": "eyJraWQiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSNiZWE2YzdjMGZkOGM0ZmNmODU0ZDg4NTBkOThlNTY4MCIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6eWRXQ3NaeHZUOXRTMmNUY1U5d3R3RSIsIm5iZiI6MTY4MTA1ODIwNywiaXNzIjoiZGlkOmVic2k6enRTSGZOVUZEWG1xQk5rWThVQkg4VkUiLCJpYXQiOjE2ODEwNTgyMDcsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb25USURpcGxvbWEiXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo5YWNkNzE3YS04NzBlLTQ3NDctOTUxNy1lMDE5MGVkYjg1MTYiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6dFNIZk5VRkRYbXFCTmtZOFVCSDhWRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMDlUMTY6MzY6NDdaIiwiaXNzdWVkIjoiMjAyMy0wNC0wOVQxNjozNjo0N1oiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTA5VDE2OjM2OjQ3WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24tdGktZGlwbG9tYS5qc29uIiwidHlwZSI6IkZ1bGxKc29uU2NoZW1hVmFsaWRhdG9yMjAyMSJ9LCJjcmVkZW50aWFsU3ViamVjdCI6eyJpZCI6ImRpZDplYnNpOnp5ZFdDc1p4dlQ5dFMyY1RjVTl3dHdFIiwiYXV0aG9yaXNhdGlvbkNsYWltcyI6W3siYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvVmVyaWZpYWJsZURpcGxvbWEuanNvbiIsImxpbWl0SnVyaXNkaWN0aW9uIjoiaHR0cDovL3B1YmxpY2F0aW9ucy5ldXJvcGEuZXUvcmVzb3VyY2UvYXV0aG9yaXR5L2F0dS9OTEQiLCJhY2NyZWRpdGF0aW9uVHlwZSI6Imh0dHA6Ly9kYXRhLmV1cm9wYS5ldS9zbmIvYWNjcmVkaXRhdGlvbi9lNTdkZGRmY2YzIiwiZGVjaXNpb24iOiJmdWxseSBjb21wbGlhbnQiLCJyZXBvcnQiOlsiaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vVVJMdG9yZXBvcnQucGRmIl0sImxpbWl0UXVhbGlmaWNhdGlvbiI6W3siaWQiOiJodHRwOi8vcXVhbGRiLm9yZy9xdWFsLzEiLCJ0aXRsZSI6Ik1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2d5IiwiYWx0ZXJuYXRpdmVMYWJlbCI6WyJEaXBsb21hIGluIFNvY2lvbG9neSIsIk1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2dpY2FsIFN0dWRpZXMiXSwiRVFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2VxZi82IiwiTlFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL3Fkci9jXzE3MTFhMDYxIn1dLCJyZXZpZXdEYXRlIjoiMjAyNC0wNC0yMlQxNDoxMTo0NFoifV19LCJ0ZXJtc09mVXNlIjpbeyJ0eXBlIjoiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb24iLCJpZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvbWFpbi9zcmMvdGVzdC9yZXNvdXJjZXMvZWJzaS90cnVzdGVkLWlzc3Vlci1jaGFpbi90YW8tdGlyLWF0dHJpYnV0ZS5qc29uIn1dLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvc3RhdHVzLzQ1IiwidHlwZSI6IkNyZWRlbnRpYWxTdGF0dXNMaXN0MjAyMCJ9fSwianRpIjoidXJuOnV1aWQ6OWFjZDcxN2EtODcwZS00NzQ3LTk1MTctZTAxOTBlZGI4NTE2In0.CkAXYfkvd7eQztRopJEdPWBfwIEFyd721QHHGDySxYa34WTk-AOI3GTYxLS5OaNw3kusHaBOPS8x42Kq6YNKtg",
+            "hash": "bffc44de220689d9f14dbe7bbe35d6c4393156b80cc56b3d27f55788625e54f6",
+            "body": "eyJraWQiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSMyNWU0ZmUxMGQ5ZTA0NTZiOGFjMDEwZjE5ZWQ1ZWMwZiIsInR5cCI6IkpXVCIsImFsZyI6IkVTMjU2SyJ9.eyJzdWIiOiJkaWQ6ZWJzaTp6ckNhTWE1OTIzVWRoaFdBNjloQXJaUyIsIm5iZiI6MTY4MTgwODA2NiwiaXNzIjoiZGlkOmVic2k6emZWeGZqQlFXWlRBSDVGZWpXb3hUYUUiLCJpYXQiOjE2ODE4MDgwNjYsInZjIjp7InR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJBY2NyZWRpdGVkVmVyaWZpYWJsZUF0dGVzdGF0aW9uIiwiVmVyaWZpYWJsZUFjY3JlZGl0YXRpb25USURpcGxvbWEiXSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiXSwiaWQiOiJ1cm46dXVpZDo1ZGQ2NzFjMi04YWQ4LTRhNGYtODUzNy00OGQ3ZWI5OTQxZTEiLCJpc3N1ZXIiOiJkaWQ6ZWJzaTp6ZlZ4ZmpCUVdaVEFINUZlaldveFRhRSIsImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDQtMThUMDg6NTQ6MjZaIiwiaXNzdWVkIjoiMjAyMy0wNC0xOFQwODo1NDoyNloiLCJ2YWxpZEZyb20iOiIyMDIzLTA0LTE4VDA4OjU0OjI2WiIsImV4cGlyYXRpb25EYXRlIjoiMjAyNC0wMS0wMVQwMDowMDowMFoiLCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9lc3NpZi5ldXJvcGEuZXUvdHNyLTEyMy92ZXJpZmlhYmxlLWFjY3JlZGl0YXRpb24tdGktZGlwbG9tYS5qc29uIiwidHlwZSI6IkZ1bGxKc29uU2NoZW1hVmFsaWRhdG9yMjAyMSJ9LCJjcmVkZW50aWFsU3ViamVjdCI6eyJpZCI6ImRpZDplYnNpOnpyQ2FNYTU5MjNVZGhoV0E2OWhBclpTIiwiYXV0aG9yaXNhdGlvbkNsYWltcyI6W3siYXV0aG9yaXNlZFNjaGVtYUlkIjoiaHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3dhbHQtaWQvd2FsdGlkLXNzaWtpdC12Y2xpYi9tYXN0ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL3NjaGVtYXMvVmVyaWZpYWJsZURpcGxvbWEuanNvbiIsImxpbWl0SnVyaXNkaWN0aW9uIjoiaHR0cDovL3B1YmxpY2F0aW9ucy5ldXJvcGEuZXUvcmVzb3VyY2UvYXV0aG9yaXR5L2F0dS9OTEQiLCJhY2NyZWRpdGF0aW9uVHlwZSI6Imh0dHA6Ly9kYXRhLmV1cm9wYS5ldS9zbmIvYWNjcmVkaXRhdGlvbi9lNTdkZGRmY2YzIiwiZGVjaXNpb24iOiJmdWxseSBjb21wbGlhbnQiLCJyZXBvcnQiOlsiaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20vVVJMdG9yZXBvcnQucGRmIl0sImxpbWl0UXVhbGlmaWNhdGlvbiI6W3siaWQiOiJodHRwOi8vcXVhbGRiLm9yZy9xdWFsLzEiLCJ0aXRsZSI6Ik1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2d5IiwiYWx0ZXJuYXRpdmVMYWJlbCI6WyJEaXBsb21hIGluIFNvY2lvbG9neSIsIk1hc3RlcnMnIERpcGxvbWEgaW4gU29jaW9sb2dpY2FsIFN0dWRpZXMiXSwiRVFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL2VxZi82IiwiTlFGTGV2ZWwiOiJodHRwOi8vZGF0YS5ldXJvcGEuZXUvc25iL3Fkci9jXzE3MTFhMDYxIn1dLCJyZXZpZXdEYXRlIjoiMjAyNC0wNC0yMlQxNDoxMTo0NFoifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvZmVhdC1uZW9tLWNyZWRlbnRpYWwtc2NoZW1hcy9zcmMvdGVzdC9yZXNvdXJjZXMvc2NoZW1hcy9ORU9NL1ByZWduYW5jeUNlcnRpZmljYXRlLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQtdmNsaWIvbWFzdGVyL3NyYy90ZXN0L3Jlc291cmNlcy9zY2hlbWFzL0V1cm9wYXNzLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS93YWx0LWlkL3dhbHRpZC1zc2lraXQvZmVhdC1uZW9tLWNyZWRlbnRpYWwtc2NoZW1hcy9zcmMvdGVzdC9yZXNvdXJjZXMvc2NoZW1hcy9ORU9NL1N0dWRlbnRDYXJkLmpzb24ifSx7ImF1dGhvcmlzZWRTY2hlbWFJZCI6Imh0dHBzOi8vYXBpLXBpbG90LmVic2kuZXUvdHJ1c3RlZC1zY2hlbWFzLXJlZ2lzdHJ5L3YyL3NjaGVtYXMvMHg0ZGQzOTI2Y2Q5MmJiM2NiNjRmYTZjODM3NTM5ZWQzMWZjMzBkZDM4YTExMjY2YTkxNjc4ZWZhNzI2OGNkZTA5In1dfSwidGVybXNPZlVzZSI6W3sidHlwZSI6IlZlcmlmaWFibGVBY2NyZWRpdGF0aW9uIiwiaWQiOiJodHRwczovL3Jhdy5naXRodWJ1c2VyY29udGVudC5jb20vd2FsdC1pZC93YWx0aWQtc3Npa2l0L21haW4vc3JjL3Rlc3QvcmVzb3VyY2VzL2Vic2kvdHJ1c3RlZC1pc3N1ZXItY2hhaW4vdGFvLXRpci1hdHRyaWJ1dGUuanNvbiJ9XSwiY3JlZGVudGlhbFN0YXR1cyI6eyJpZCI6Imh0dHBzOi8vZXNzaWYuZXVyb3BhLmV1L3N0YXR1cy80NSIsInR5cGUiOiJDcmVkZW50aWFsU3RhdHVzTGlzdDIwMjAifX0sImp0aSI6InVybjp1dWlkOjVkZDY3MWMyLThhZDgtNGE0Zi04NTM3LTQ4ZDdlYjk5NDFlMSJ9.YViBcEHN7wVs5aMtpPDmLOAWgD_v8MSTKr2iSBqTKJF5sVhn_a1o1DTMDHfBU7bFHI4PI7tVBStHdwB1Urks5w",
             "issuerType": "TI",
-            "tao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE",
-            "rootTao": "did:ebsi:ztSHfNUFDXmqBNkY8UBH8VE"
+            "tao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE",
+            "rootTao": "did:ebsi:zfVxfjBQWZTAH5FejWoxTaE"
         }
     ]
 }