diff --git a/src/main/resources/REST/json/Presentation.json b/src/main/resources/REST/json/Presentation.json
index 39f87c935b3b06b1ed74fe5cc587409c6f3d0fc1..332786fbcf787d55dedbcf12b04da1ee7b341713 100644
--- a/src/main/resources/REST/json/Presentation.json
+++ b/src/main/resources/REST/json/Presentation.json
@@ -88,13 +88,12 @@
   "modified_issuanceDate": {
     "@context": [
       "https://www.w3.org/2018/credentials/v1",
-      "https://w3id.org/security/suites/jws-2020/v1",
-      "https://www.w3.org/2018/credentials/examples/v1"
+      "https://w3id.org/security/suites/jws-2020/v1"
     ],
     "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-21T14:28:09.071187173Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEQCIFkavr6XpAYbdurBmQXNei-hI8WHAcnEYkZ6J3i4d3FKAiA4BtVCAixsAypaJ5dcBxn96Ju1OGfi7Kw1QRZMlMumhg",
+      "created": "2022-08-03T06:05:59.224982676Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIG-PwWIzvaxnD_HDabNPWq5K9hOf99WsCAIWhWExSjXtAiEA3TkKOnU3vpK_GqShJeyKei6yfJfgUyUG8UmfLTuBHsU",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -104,50 +103,13 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://www.w3.org/2018/credentials/examples/v1"
-        ],
-        "credentialSubject": {
-          "allow": true,
-          "id": "example/examplePolicy/1.0"
-        },
-        "issuanceDate": "2022-07-21T10:24:36.203848291Z",
-        "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
-        "type": "VerifiableCredential"
-      },
-      {
-        "@context": [
-          "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://www.w3.org/2018/credentials/examples/v1"
-        ],
-        "credentialSubject": {
-          "allow": true,
-          "id": "example/ProofRequestResponse/1.0"
-        },
-        "issuanceDate": "2023-07-21T10:24:36.203861194Z",
-        "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
-        "type": "VerifiableCredential"
-      }
-    ]
-  },
-  "incorrect_ID_for_proof": {
-    "@context": [
-      "https://www.w3.org/2018/credentials/v1",
-      "https://w3id.org/security/suites/jws-2020/v1"
-    ],
-    "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
-    "type": "VerifiablePresentation",
-    "verifiableCredential": [
-      {
-        "@context": [
-          "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": true,
-          "id": "incorrect_ID"
+          "citizenship": "France",
+          "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
@@ -156,14 +118,13 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
           "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
-        "issuanceDate": "2022-07-21T10:24:36.203861194Z",
+        "issuanceDate": "2023-07-21T10:24:36.203861194Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
         "type": "VerifiableCredential"
       }
@@ -176,8 +137,8 @@
     ],
     "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-29T15:01:11.776816778Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIQCUaAcVPM0IuKmZMkLgQ0YwKwqcUarymUX-aE6AgZwAggIgW1-u3T2RKHHcnEI6HKTRXM3xAQ-C2ctU7qSrmzfyYl4",
+      "created": "2022-08-03T06:11:38.170830056Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQDJ7gTTZju3fJ-xaCBcWYziuI4J80S19AdxwNl3x4nzIQIhALApZj26dRANZZx5mp6PlChh1TExNc203LFPkHzfCWGk",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -187,11 +148,12 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": false,
+          "citizenship": "France",
           "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
@@ -201,8 +163,7 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
@@ -266,8 +227,8 @@
     ],
     "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-29T15:01:11.776816778Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIQCUaAcVPM0IuKmZMkLgQ0YwKwqcUarymUX-aE6AgZwAggIgW1-u3T2RKHHcnEI6HKTRXM3xAQ-C2ctU7qSrmzfyYl4",
+      "created": "2022-08-03T06:11:38.170830056Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQDJ7gTTZju3fJ-xaCBcWYziuI4J80S19AdxwNl3x4nzIQIhALApZj26dRANZZx5mp6PlChh1TExNc203LFPkHzfCWGk",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -277,11 +238,12 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": true,
+          "citizenship": "France",
           "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
@@ -291,8 +253,7 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": false,
@@ -311,8 +272,8 @@
     ],
     "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-29T15:01:11.776816778Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIQCUaAcVPM0IuKmZMkLgQ0YwKwqcUarymUX-aE6AgZwAggIgW1-u3T2RKHHcnEI6HKTRXM3xAQ-C2ctU7qSrmzfyYl4",
+      "created": "2022-08-03T06:44:14.016800951Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQCdpKnxGXPUCZ7fB9QNdZiiKTJ4vIcLudyYtysVOUG7dQIhAMr5DqWP7-lB0cDpDqrdakub38iUZxtxDLVoYO50tLmN",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -322,11 +283,12 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": true,
+          "citizenship": "France",
           "id": "invalid_ID"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
@@ -336,8 +298,7 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
@@ -356,8 +317,8 @@
     ],
     "id": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-29T15:01:11.776816778Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEUCIQCUaAcVPM0IuKmZMkLgQ0YwKwqcUarymUX-aE6AgZwAggIgW1-u3T2RKHHcnEI6HKTRXM3xAQ-C2ctU7qSrmzfyYl4",
+      "created": "2022-08-03T06:44:14.016800951Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQCdpKnxGXPUCZ7fB9QNdZiiKTJ4vIcLudyYtysVOUG7dQIhAMr5DqWP7-lB0cDpDqrdakub38iUZxtxDLVoYO50tLmN",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -367,12 +328,13 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": true,
-          "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
+          "citizenship": "France",
+          "id": "invalid_ID"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
@@ -381,12 +343,11 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
-          "id": "invalid_ID"
+          "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203861194Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
@@ -397,13 +358,12 @@
   "modified_ID": {
     "@context": [
       "https://www.w3.org/2018/credentials/v1",
-      "https://w3id.org/security/suites/jws-2020/v1",
-      "https://www.w3.org/2018/credentials/examples/v1"
+      "https://w3id.org/security/suites/jws-2020/v1"
     ],
-    "id": "did:web:XXX.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
+    "id": "did:web:gaiax.XXXXX.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
     "proof": {
-      "created": "2022-07-21T14:28:09.071187173Z",
-      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEQCIFkavr6XpAYbdurBmQXNei-hI8WHAcnEYkZ6J3i4d3FKAiA4BtVCAixsAypaJ5dcBxn96Ju1OGfi7Kw1QRZMlMumhg",
+      "created": "2022-08-03T06:11:38.170830056Z",
+      "jws": "eyJhbGciOiJKc29uV2ViU2lnbmF0dXJlMjAyMCIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..MEYCIQDJ7gTTZju3fJ-xaCBcWYziuI4J80S19AdxwNl3x4nzIQIhALApZj26dRANZZx5mp6PlChh1TExNc203LFPkHzfCWGk",
       "proofPurpose": "assertionMethod",
       "type": "JsonWebSignature2020",
       "verificationMethod": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1"
@@ -413,12 +373,13 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://www.w3.org/2018/credentials/examples/v1"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
+          "age_over": 18,
           "allow": true,
-          "id": "example/examplePolicy/1.0"
+          "citizenship": "France",
+          "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203848291Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
@@ -427,12 +388,11 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://www.w3.org/2018/credentials/examples/v1"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
-          "id": "example/ProofRequestResponse/1.0"
+          "id": "https://gaiax.vereign.com/tsa/policy/example/ProofRequestResponse/1.0"
         },
         "issuanceDate": "2022-07-21T10:24:36.203861194Z",
         "issuer": "did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation",
@@ -497,8 +457,7 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
@@ -511,8 +470,7 @@
       {
         "@context": [
           "https://www.w3.org/2018/credentials/v1",
-          "https://w3id.org/security/suites/jws-2020/v1",
-          "https://schema.org"
+          "https://w3id.org/security/suites/jws-2020/v1"
         ],
         "credentialSubject": {
           "allow": true,
diff --git a/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature b/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature
index eab546dfca87a58ba5bcd3433e6c1c695b7d0bd9..33fd91234942b62c54d7c95ecdd2dd1a7f17d430 100644
--- a/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature
+++ b/src/test/resources/features/tsa/signer/v1/presentation/verify/POST.feature
@@ -36,7 +36,7 @@ Feature: API - TSA - Signer presentation verify - v1/presentation/verify POST
     And the status code should be {200}
     And the field {valid} has the value {true}
 
-  @wip @bug-signer#19 @negative
+  @negative
   Scenario: TSA - verify presentation proof with missing proof - Negative
     When I load the REST request {Presentation.json} with profile {for_proof}
     When I create presentation proof via TSA Signer API
@@ -46,21 +46,8 @@ Feature: API - TSA - Signer presentation verify - v1/presentation/verify POST
     Then I get the last response body and load it to the current request body
     When I load the REST request {Presentation.json} with profile {missing_proof}
     And I verify presentation proof via TSA Signer API
-#    And the status code should be {400}
-#    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
-
-  @wip @bug-signer#18 @negative
-  Scenario: TSA - verify presentation proof with incorrect ID field - Negative
-    When I load the REST request {Presentation.json} with profile {incorrect_ID_for_proof}
-    When I create presentation proof via TSA Signer API
-    And the status code should be {200}
-    And the response is valid according to the {Signer_PresentationProof_schema.json} REST schema
-    And the field {proof.verificationMethod} has the value {did:web:gaiax.vereign.com:tsa:policy:policy:example:returnDID:1.0:evaluation#key1}
-    Then I get the last response body and load it to the current request body
-    When I load the REST request {Presentation.json} with profile {incorrect_ID}
-    And I verify presentation proof via TSA Signer API
-#    And the status code should be {400}
-#    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
+    And the status code should be {400}
+    And the field {message} has the value {verifiable presentation must have proof section}
 
   @negative
   Scenario: TSA - verify presentation proof with modified ID field - Negative
@@ -88,7 +75,7 @@ Feature: API - TSA - Signer presentation verify - v1/presentation/verify POST
     And the status code should be {400}
     And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
 
-  @negative
+  @wip @negative
   Scenario: TSA - verify presentation proof with modified first credentialSubject.allow field - Negative
     When I load the REST request {Presentation.json} with profile {for_proof}
     When I create presentation proof via TSA Signer API
@@ -98,10 +85,10 @@ Feature: API - TSA - Signer presentation verify - v1/presentation/verify POST
     Then I get the last response body and load it to the current request body
     When I load the REST request {Presentation.json} with profile {modified_credentialSubject_1_allow}
     And I verify presentation proof via TSA Signer API
-    And the status code should be {400}
-    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
+#    And the status code should be {400}
+#    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
 
-  @negative
+  @wip @bug-signer#20 @negative
   Scenario: TSA - verify presentation proof with modified second credentialSubject.allow field - Negative
     When I load the REST request {Presentation.json} with profile {for_proof}
     When I create presentation proof via TSA Signer API
@@ -111,8 +98,8 @@ Feature: API - TSA - Signer presentation verify - v1/presentation/verify POST
     Then I get the last response body and load it to the current request body
     When I load the REST request {Presentation.json} with profile {modified_credentialSubject_2_allow}
     And I verify presentation proof via TSA Signer API
-    And the status code should be {400}
-    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
+#    And the status code should be {400}
+#    And the field {message} has the value {check embedded proof: check linked data proof: ecdsa: invalid signature}
 
   @negative
   Scenario: TSA - verify presentation proof with modified first credentialSubject.ID field - Negative