From cde04ddbd6d8b994709373a39c4535525b64e933 Mon Sep 17 00:00:00 2001
From: VHofman <vincent.hofman@kereval.com>
Date: Mon, 19 Feb 2024 13:52:10 +0100
Subject: [PATCH] Added EHS/ATC + samples + reorg

---
 ...rieveATNAAuditEvent-ValidationProfile.json | 281 ++++++++++++++++++
 ...ITI-104-PatientFeed-ValidationProfile.json |   0
 ...H-ITI-83-GetRequest-ValidationProfile.json |   0
 .../ATC/CH-ATC - 001 - valid - Query.b64      |   1 +
 .../ATC/CH-ATC - 001 - valid - Query.txt      |   3 +
 ...-ATC - 002 - valid - Query with 1 date.b64 |   1 +
 ...-ATC - 002 - valid - Query with 1 date.txt |   3 +
 ... - 003 - valid - with agent.identifier.b64 |   1 +
 ... - 003 - valid - with agent.identifier.txt |   3 +
 ...H-ATC - 004 - valid - with entity-type.b64 |   1 +
 ...H-ATC - 004 - valid - with entity-type.txt |   3 +
 ...H-ATC - 005 - valid - with entity.role.b64 |   1 +
 ...H-ATC - 005 - valid - with entity.role.txt |   3 +
 .../CH-ATC - 006 - valid - with subtype.b64   |   1 +
 .../CH-ATC - 006 - valid - with subtype.txt   |   3 +
 ... - invalid - without entity.identifier.b64 |   1 +
 ... - invalid - without entity.identifier.txt |   3 +
 ...lid - with bad entity.identifier value.b64 |   1 +
 ...lid - with bad entity.identifier value.txt |   3 +
 ...- invalid - without comparator in date.b64 |   1 +
 ...- invalid - without comparator in date.txt |   3 +
 .../CH-ATC - 010 - invalid - without date.b64 |   1 +
 .../CH-ATC - 010 - invalid - without date.txt |   3 +
 .../CH-ATC - 011 - invalid - with address.b64 |   1 +
 .../CH-ATC - 011 - invalid - with address.txt |   3 +
 ...12 - invalid - with patient.identifier.b64 |   1 +
 ...12 - invalid - with patient.identifier.txt |   3 +
 .../CH-ATC - 013 - invalid - with source.b64  |   1 +
 .../CH-ATC - 013 - invalid - with source.txt  |   3 +
 .../CH-ATC - 014 - invalid - with type.b64    |   1 +
 .../CH-ATC - 014 - invalid - with type.txt    |   3 +
 .../CH-ATC - 015 - invalid - with user.b64    |   1 +
 .../CH-ATC - 015 - invalid - with user.txt    |   3 +
 .../CH-ATC - 016 - invalid - with outcome.b64 |   1 +
 .../CH-ATC - 016 - invalid - with outcome.txt |   3 +
 ... 017 - invalid - without Authorization.b64 |   1 +
 ... 017 - invalid - without Authorization.txt |   2 +
 ...018 - invalid - with bad Authorization.b64 |   1 +
 ...018 - invalid - with bad Authorization.txt |   3 +
 ...019 - invalid - with bad Authorization.b64 |   1 +
 ...019 - invalid - with bad Authorization.txt |   3 +
 ...020 - invalid - with bad Authorization.b64 |   1 +
 ...020 - invalid - with bad Authorization.txt |   3 +
 EHS/samples/{ => CH-PIXm}/CH_ITI-104.txt      |   0
 EHS/samples/{ => CH-PIXm}/CH_ITI-83.txt       |   0
 ...-ITI-83-PostRequest-ValidationProfile.json | 115 -------
 ...ITI-104-PatientFeed-ValidationProfile.json |   0
 ...E-ITI-83-GetRequest-ValidationProfile.json |   0
 ...-ITI-83-PostRequest-ValidationProfile.json |   0
 .../IHE_ITI-104_AddReviseWithIUA_sample.txt   |   0
 .../IHE_ITI-104_AddRevise_sample.txt          |   0
 .../{ => PIXm}/IHE_ITI-104_Delete_sample.txt  |   0
 .../{ => PIXm}/IHE_ITI-104_Merge_sample.txt   |   0
 ...alid -GET request without targetSystem.b64 |   0
 ...alid -GET request without targetSystem.txt |   0
 ...valid -GET request with 1 targetSystem.txt |   0
 ...valid -GET request with 3 targetSystem.txt |   0
 ...quest with 1 targetSystem + XML format.txt |   0
 ...uest with 3 targetSystem + JSON format.txt |   0
 ...targetSystem + JSON format + IUA token.b64 |   0
 ...targetSystem + JSON format + IUA token.txt |   0
 ... Get request with bad sourceIdentifier.txt |   0
 ...id - Get request with bad targetSystem.txt |   0
 ...invalid - Get request with bad _format.txt |   0
 ...valid - Get request with bad IUA token.txt |   0
 ...valid - Get request with bad IUA token.txt |   0
 ...valid - Get request with bad IUA token.txt |   0
 67 files changed, 360 insertions(+), 115 deletions(-)
 create mode 100644 EHS/ATC/CH-ATC-RetrieveATNAAuditEvent-ValidationProfile.json
 rename EHS/{validationProfiles => CH-PIXm}/CH-ITI-104-PatientFeed-ValidationProfile.json (100%)
 rename EHS/{validationProfiles => CH-PIXm}/CH-ITI-83-GetRequest-ValidationProfile.json (100%)
 create mode 100644 EHS/samples/ATC/CH-ATC - 001 - valid - Query.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 001 - valid - Query.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 010 - invalid - without date.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 010 - invalid - without date.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 011 - invalid - with address.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 011 - invalid - with address.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 013 - invalid - with source.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 013 - invalid - with source.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 014 - invalid - with type.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 014 - invalid - with type.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 015 - invalid - with user.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 015 - invalid - with user.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.txt
 create mode 100644 EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.b64
 create mode 100644 EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.txt
 rename EHS/samples/{ => CH-PIXm}/CH_ITI-104.txt (100%)
 rename EHS/samples/{ => CH-PIXm}/CH_ITI-83.txt (100%)
 delete mode 100644 EHS/validationProfiles/CH-ITI-83-PostRequest-ValidationProfile.json
 rename IHE Validation profiles/{ => PIXm}/IHE-ITI-104-PatientFeed-ValidationProfile.json (100%)
 rename IHE Validation profiles/{ => PIXm}/IHE-ITI-83-GetRequest-ValidationProfile.json (100%)
 rename IHE Validation profiles/{ => PIXm}/IHE-ITI-83-PostRequest-ValidationProfile.json (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-104_AddReviseWithIUA_sample.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-104_AddRevise_sample.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-104_Delete_sample.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-104_Merge_sample.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 001 - valid -GET request without targetSystem.b64 (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 001 - valid -GET request without targetSystem.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 002 - valid -GET request with 1 targetSystem.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 003 - valid -GET request with 3 targetSystem.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 004 - valid -GET request with 1 targetSystem + XML format.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 005 - valid -GET request with 3 targetSystem + JSON format.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.b64 (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 007 - invalid - Get request with bad sourceIdentifier.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 008 - invalid - Get request with bad targetSystem.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 009 - invalid - Get request with bad _format.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 010 - invalid - Get request with bad IUA token.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 011 - invalid - Get request with bad IUA token.txt (100%)
 rename IHE Validation profiles/samples/{ => PIXm}/IHE_ITI-83 - 012 - invalid - Get request with bad IUA token.txt (100%)

diff --git a/EHS/ATC/CH-ATC-RetrieveATNAAuditEvent-ValidationProfile.json b/EHS/ATC/CH-ATC-RetrieveATNAAuditEvent-ValidationProfile.json
new file mode 100644
index 0000000..2fb3b35
--- /dev/null
+++ b/EHS/ATC/CH-ATC-RetrieveATNAAuditEvent-ValidationProfile.json
@@ -0,0 +1,281 @@
+{
+  "profileType": "HTTPREQUEST",
+  "id": "CH_ATC_RetrieveAuditEvent",
+  "name": "CH_ATC_RetrieveAuditEvent",
+  "description": "Validation Profile for validating an ATC query",
+  "context": "EPR",
+  "assertions": [
+      {
+          "selector": "request.method",
+          "id": "GETMethodChecking",
+          "description": "HTTP method shall be GET",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+              {
+                  "type": "FIXEDVALUE",
+                  "fixedValue": "GET"
+              }
+          ]
+      },
+      {
+          "selector": "request.version",
+          "id": "HTTP1VersionChecking",
+          "description": "The HTTP version shall be HTTP/1.1 ",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "FIXEDVALUE",
+              "fixedValue": "HTTP/1.1"
+            }
+          ]
+        },
+        {
+            "selector": "request.uri.path",
+            "id": "URIRegexChecking",
+            "description": "URI path of the request shall match '^(\\S)+AuditEvent$' regex",
+            "requirementPriority": "MANDATORY",
+            "checksComposition": "oneOf",
+            "checks": [
+                {
+                    "type": "REGEX",
+                    "regex": "^(\\S)+AuditEvent$"
+                }
+            ]
+        },
+        {
+          "selector": "request.headers('Host').values",
+          "id": "HostChecking",
+          "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('Authorization').values",
+          "id": "Authorization_parameter_presence",
+          "description": "The Authorization parameter is mandatory.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 1,
+              "maxOccurrence": 1
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('Authorization').values",
+          "id": "Authorization_parameter_value",
+          "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('entity.identifier').values",
+          "id": "entity.identifier_parameter_presence",
+          "description": "One and only one entity.identifier parameter is required.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 1,
+              "maxOccurrence": 1
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('entity.identifier').values",
+          "id": "entity.identifier_parameter_value",
+          "description": "entity.identifier parameter's value is a token composed of the Assigning Authority urn:oid:2.16.756.5.30.1.127.3.10.3, a pipe and the EPR-SPID.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^urn\\:oid\\:2\\.16\\.756\\.5\\.30\\.1\\.127\\.3\\.10\\.3\\|\\d+$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('date')",
+          "id": "date_parameter_presence",
+          "description": "At least 1 date parameter shall be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(?=.*date=).+$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('date').values",
+          "id": "date_parameter_value",
+          "description": "date parameter's value is composed by a comparator and YYYY-MM-DD. regex: '^(eq|ne|lt|gt|ge|le|sa|eb|ap)\\d{4}-\\d{2}-\\d{2}$'",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(eq|ne|lt|gt|ge|le|sa|eb|ap)\\d{4}-\\d{2}-\\d{2}$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('agent.identifier').values",
+          "id": "agent.identifier_parameter_value",
+          "description": "agent.identifier parameter's value shall be a token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "applyIf": "request.uri.queryParams('agent.identifier').values.size() > 0",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^.*?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('entity-type').values",
+          "id": "entity-type_parameter_value",
+          "description": "entity-type parameter's value shall be a token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "applyIf": "request.uri.queryParams('entity-type').values.size() > 0",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^.*?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('entity-role').values",
+          "id": "entity-role_parameter_value",
+          "description": "entity-role parameter's value shall be a token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "applyIf": "request.uri.queryParams('entity-role').values.size() > 0",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^.*?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('subtype').values",
+          "id": "subtype_parameter_value",
+          "description": "subtype parameter's value shall be a token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "applyIf": "request.uri.queryParams('subtype').values.size() > 0",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^.*?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('address').values",
+          "id": "address_parameter_presence",
+          "description": "address parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('patient.identifier').values",
+          "id": "patient.identifier_parameter_presence",
+          "description": "patient.identifier parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('source').values",
+          "id": "source_parameter_presence",
+          "description": "source parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('type').values",
+          "id": "type_parameter_presence",
+          "description": "type parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('user').values",
+          "id": "user_parameter_presence",
+          "description": "user parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.queryParams('outcome').values",
+          "id": "outcome_parameter_presence",
+          "description": "outcome parameter shall not be used.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 0,
+              "maxOccurrence": 0
+            }
+          ]
+        }
+  ]
+}
\ No newline at end of file
diff --git a/EHS/validationProfiles/CH-ITI-104-PatientFeed-ValidationProfile.json b/EHS/CH-PIXm/CH-ITI-104-PatientFeed-ValidationProfile.json
similarity index 100%
rename from EHS/validationProfiles/CH-ITI-104-PatientFeed-ValidationProfile.json
rename to EHS/CH-PIXm/CH-ITI-104-PatientFeed-ValidationProfile.json
diff --git a/EHS/validationProfiles/CH-ITI-83-GetRequest-ValidationProfile.json b/EHS/CH-PIXm/CH-ITI-83-GetRequest-ValidationProfile.json
similarity index 100%
rename from EHS/validationProfiles/CH-ITI-83-GetRequest-ValidationProfile.json
rename to EHS/CH-PIXm/CH-ITI-83-GetRequest-ValidationProfile.json
diff --git a/EHS/samples/ATC/CH-ATC - 001 - valid - Query.b64 b/EHS/samples/ATC/CH-ATC - 001 - valid - Query.b64
new file mode 100644
index 0000000..831d39e
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 001 - valid - Query.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0Cg==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 001 - valid - Query.txt b/EHS/samples/ATC/CH-ATC - 001 - valid - Query.txt
new file mode 100644
index 0000000..5d98cdc
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 001 - valid - Query.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.b64 b/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.b64
new file mode 100644
index 0000000..55baa88
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.txt b/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.txt
new file mode 100644
index 0000000..59f1668
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 002 - valid - Query with 1 date.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
diff --git a/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.b64 b/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.b64
new file mode 100644
index 0000000..b09fa83
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZhZ2VudC5pZGVudGlmaWVyPUZyYW56IEhUVFAvMS4xCkF1dGhvcml6YXRpb246IEJlYXJlciBQSE5oYld3eU9rRnpjMlZ5ZEdsdmJpQjRiV3h1Y3pwellXMXNNajBpZFhKdU9tOWhjMmx6T201aGJXVnpPblJqT2xOQlRVdzZNaTR3T21GemMyVnlkR2x2YmlJZ2VHMXNibk02ZUhNOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoSWlCNGJXeHVjenA0YzJrOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoTFdsdWMzUmhibU5sSWlCSlJEMGlYemd3WmpsbE5XUTNMVGN6TW1ZdE5EWm1OaTFpTkdWbUxUWXpZak5oTkROaVl6YzNOQ0lnU1hOemRXVkpibk4wWVc1MFBTSXlNREkwTFRBeUxUQTRWREUxT2pReU9qTXhMakkyTTFvaUlGWmxjbk5wYjI0OUlqSXVNQ0krUEhOaGJXd3lPa2x6YzNWbGNqNW9kSFJ3Y3pvdkwyVm9aV0ZzZEdoemRXbHpjMlV1YVdobExXVjFjbTl3WlM1dVpYUXZVMVJUUEM5ellXMXNNanBKYzNOMVpYSStQR1J6T2xOcFoyNWhkSFZ5WlNCNGJXeHVjenBrY3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSXlJK1BHUnpPbE5wWjI1bFpFbHVabTgrUEdSek9rTmhibTl1YVdOaGJHbDZZWFJwYjI1TlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXhMekV3TDNodGJDMWxlR010WXpFMGJpTWlMejQ4WkhNNlUybG5ibUYwZFhKbFRXVjBhRzlrSUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTNKellTMXphR0V4SWk4K1BHUnpPbEpsWm1WeVpXNWpaU0JWVWtrOUlpTmZPREJtT1dVMVpEY3ROek15WmkwME5tWTJMV0kwWldZdE5qTmlNMkUwTTJKak56YzBJajQ4WkhNNlZISmhibk5tYjNKdGN6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTJWdWRtVnNiM0JsWkMxemFXZHVZWFIxY21VaUx6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNUzh4TUM5NGJXd3RaWGhqTFdNeE5HNGpJaTgrUEM5a2N6cFVjbUZ1YzJadmNtMXpQanhrY3pwRWFXZGxjM1JOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBd0x6QTVMM2h0Ckhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.txt b/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.txt
new file mode 100644
index 0000000..d8ba56a
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 003 - valid - with agent.identifier.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&agent.identifier=Franz HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.b64 b/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.b64
new file mode 100644
index 0000000..b942880
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZlbnRpdHktdHlwZT1zcGl0YWwgSFRUUC8xLjEKQXV0aG9yaXphdGlvbjogQmVhcmVyIFBITmhiV3d5T2tGemMyVnlkR2x2YmlCNGJXeHVjenB6WVcxc01qMGlkWEp1T205aGMybHpPbTVoYldWek9uUmpPbE5CVFV3Nk1pNHdPbUZ6YzJWeWRHbHZiaUlnZUcxc2JuTTZlSE05SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhJaUI0Yld4dWN6cDRjMms5SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhMV2x1YzNSaGJtTmxJaUJKUkQwaVh6Z3daamxsTldRM0xUY3pNbVl0TkRabU5pMWlOR1ZtTFRZellqTmhORE5pWXpjM05DSWdTWE56ZFdWSmJuTjBZVzUwUFNJeU1ESTBMVEF5TFRBNFZERTFPalF5T2pNeExqSTJNMW9pSUZabGNuTnBiMjQ5SWpJdU1DSStQSE5oYld3eU9rbHpjM1ZsY2o1b2RIUndjem92TDJWb1pXRnNkR2h6ZFdsemMyVXVhV2hsTFdWMWNtOXdaUzV1WlhRdlUxUlRQQzl6WVcxc01qcEpjM04xWlhJK1BHUnpPbE5wWjI1aGRIVnlaU0I0Yld4dWN6cGtjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JeUkrUEdSek9sTnBaMjVsWkVsdVptOCtQR1J6T2tOaGJtOXVhV05oYkdsNllYUnBiMjVOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBeEx6RXdMM2h0YkMxbGVHTXRZekUwYmlNaUx6NDhaSE02VTJsbmJtRjBkWEpsVFdWMGFHOWtJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JM0p6WVMxemFHRXhJaTgrUEdSek9sSmxabVZ5Wlc1alpTQlZVa2s5SWlOZk9EQm1PV1UxWkRjdE56TXlaaTAwTm1ZMkxXSTBaV1l0TmpOaU0yRTBNMkpqTnpjMElqNDhaSE02VkhKaGJuTm1iM0p0Y3o0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JMlZ1ZG1Wc2IzQmxaQzF6YVdkdVlYUjFjbVVpTHo0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01TOHhNQzk0Yld3dFpYaGpMV014Tkc0aklpOCtQQzlrY3pwVWNtRnVjMlp2Y20xelBqeGtjenBFYVdkbGMzUk5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF3THpBNUwzaHQKSG9zdDogZWhlYWx0aHN1aXNzZS5paGUtZXVyb3BlLm5ldA==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.txt b/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.txt
new file mode 100644
index 0000000..1b71a9d
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 004 - valid - with entity-type.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&entity-type=spital HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.b64 b/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.b64
new file mode 100644
index 0000000..7c44aa3
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZlbnRpdHktcm9sZT1hZG1pbmlzdHJhdGlvbiBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.txt b/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.txt
new file mode 100644
index 0000000..4fd9309
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 005 - valid - with entity.role.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&entity-role=administration HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.b64 b/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.b64
new file mode 100644
index 0000000..ef1bbf7
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZzdWJ0eXBlPWNoZWNraW4gSFRUUC8xLjEKQXV0aG9yaXphdGlvbjogQmVhcmVyIFBITmhiV3d5T2tGemMyVnlkR2x2YmlCNGJXeHVjenB6WVcxc01qMGlkWEp1T205aGMybHpPbTVoYldWek9uUmpPbE5CVFV3Nk1pNHdPbUZ6YzJWeWRHbHZiaUlnZUcxc2JuTTZlSE05SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhJaUI0Yld4dWN6cDRjMms5SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhMV2x1YzNSaGJtTmxJaUJKUkQwaVh6Z3daamxsTldRM0xUY3pNbVl0TkRabU5pMWlOR1ZtTFRZellqTmhORE5pWXpjM05DSWdTWE56ZFdWSmJuTjBZVzUwUFNJeU1ESTBMVEF5TFRBNFZERTFPalF5T2pNeExqSTJNMW9pSUZabGNuTnBiMjQ5SWpJdU1DSStQSE5oYld3eU9rbHpjM1ZsY2o1b2RIUndjem92TDJWb1pXRnNkR2h6ZFdsemMyVXVhV2hsTFdWMWNtOXdaUzV1WlhRdlUxUlRQQzl6WVcxc01qcEpjM04xWlhJK1BHUnpPbE5wWjI1aGRIVnlaU0I0Yld4dWN6cGtjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JeUkrUEdSek9sTnBaMjVsWkVsdVptOCtQR1J6T2tOaGJtOXVhV05oYkdsNllYUnBiMjVOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBeEx6RXdMM2h0YkMxbGVHTXRZekUwYmlNaUx6NDhaSE02VTJsbmJtRjBkWEpsVFdWMGFHOWtJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JM0p6WVMxemFHRXhJaTgrUEdSek9sSmxabVZ5Wlc1alpTQlZVa2s5SWlOZk9EQm1PV1UxWkRjdE56TXlaaTAwTm1ZMkxXSTBaV1l0TmpOaU0yRTBNMkpqTnpjMElqNDhaSE02VkhKaGJuTm1iM0p0Y3o0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JMlZ1ZG1Wc2IzQmxaQzF6YVdkdVlYUjFjbVVpTHo0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01TOHhNQzk0Yld3dFpYaGpMV014Tkc0aklpOCtQQzlrY3pwVWNtRnVjMlp2Y20xelBqeGtjenBFYVdkbGMzUk5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF3THpBNUwzaHQKSG9zdDogZWhlYWx0aHN1aXNzZS5paGUtZXVyb3BlLm5ldA==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.txt b/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.txt
new file mode 100644
index 0000000..e30f332
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 006 - valid - with subtype.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&subtype=checkin HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.b64 b/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.b64
new file mode 100644
index 0000000..4bce75f
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.txt b/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.txt
new file mode 100644
index 0000000..0dcc877
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 007 - invalid - without entity.identifier.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.b64 b/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.b64
new file mode 100644
index 0000000..3c81831
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zNTY3OCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.txt b/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.txt
new file mode 100644
index 0000000..63844ad
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 008 - invalid - with bad entity.identifier value.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.35678 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.b64 b/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.b64
new file mode 100644
index 0000000..c0362b8
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPTIwMjAtMDMtMjImZGF0ZT1sZTIwMjUtMDMtMjImZW50aXR5LmlkZW50aWZpZXI9dXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuMyU3QzU2NzggSFRUUC8xLjEKQXV0aG9yaXphdGlvbjogQmVhcmVyIFBITmhiV3d5T2tGemMyVnlkR2x2YmlCNGJXeHVjenB6WVcxc01qMGlkWEp1T205aGMybHpPbTVoYldWek9uUmpPbE5CVFV3Nk1pNHdPbUZ6YzJWeWRHbHZiaUlnZUcxc2JuTTZlSE05SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhJaUI0Yld4dWN6cDRjMms5SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhMV2x1YzNSaGJtTmxJaUJKUkQwaVh6Z3daamxsTldRM0xUY3pNbVl0TkRabU5pMWlOR1ZtTFRZellqTmhORE5pWXpjM05DSWdTWE56ZFdWSmJuTjBZVzUwUFNJeU1ESTBMVEF5TFRBNFZERTFPalF5T2pNeExqSTJNMW9pSUZabGNuTnBiMjQ5SWpJdU1DSStQSE5oYld3eU9rbHpjM1ZsY2o1b2RIUndjem92TDJWb1pXRnNkR2h6ZFdsemMyVXVhV2hsTFdWMWNtOXdaUzV1WlhRdlUxUlRQQzl6WVcxc01qcEpjM04xWlhJK1BHUnpPbE5wWjI1aGRIVnlaU0I0Yld4dWN6cGtjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JeUkrUEdSek9sTnBaMjVsWkVsdVptOCtQR1J6T2tOaGJtOXVhV05oYkdsNllYUnBiMjVOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBeEx6RXdMM2h0YkMxbGVHTXRZekUwYmlNaUx6NDhaSE02VTJsbmJtRjBkWEpsVFdWMGFHOWtJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JM0p6WVMxemFHRXhJaTgrUEdSek9sSmxabVZ5Wlc1alpTQlZVa2s5SWlOZk9EQm1PV1UxWkRjdE56TXlaaTAwTm1ZMkxXSTBaV1l0TmpOaU0yRTBNMkpqTnpjMElqNDhaSE02VkhKaGJuTm1iM0p0Y3o0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JMlZ1ZG1Wc2IzQmxaQzF6YVdkdVlYUjFjbVVpTHo0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01TOHhNQzk0Yld3dFpYaGpMV014Tkc0aklpOCtQQzlrY3pwVWNtRnVjMlp2Y20xelBqeGtjenBFYVdkbGMzUk5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF3THpBNUwzaHQKSG9zdDogZWhlYWx0aHN1aXNzZS5paGUtZXVyb3BlLm5ldA==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.txt b/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.txt
new file mode 100644
index 0000000..d696c82
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 009 - invalid - without comparator in date.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.b64 b/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.b64
new file mode 100644
index 0000000..f26e844
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZhZGRyZXNzPVN3aXR6ZXJsYW5kIEhUVFAvMS4xCkF1dGhvcml6YXRpb246IEJlYXJlciBQSE5oYld3eU9rRnpjMlZ5ZEdsdmJpQjRiV3h1Y3pwellXMXNNajBpZFhKdU9tOWhjMmx6T201aGJXVnpPblJqT2xOQlRVdzZNaTR3T21GemMyVnlkR2x2YmlJZ2VHMXNibk02ZUhNOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoSWlCNGJXeHVjenA0YzJrOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoTFdsdWMzUmhibU5sSWlCSlJEMGlYemd3WmpsbE5XUTNMVGN6TW1ZdE5EWm1OaTFpTkdWbUxUWXpZak5oTkROaVl6YzNOQ0lnU1hOemRXVkpibk4wWVc1MFBTSXlNREkwTFRBeUxUQTRWREUxT2pReU9qTXhMakkyTTFvaUlGWmxjbk5wYjI0OUlqSXVNQ0krUEhOaGJXd3lPa2x6YzNWbGNqNW9kSFJ3Y3pvdkwyVm9aV0ZzZEdoemRXbHpjMlV1YVdobExXVjFjbTl3WlM1dVpYUXZVMVJUUEM5ellXMXNNanBKYzNOMVpYSStQR1J6T2xOcFoyNWhkSFZ5WlNCNGJXeHVjenBrY3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSXlJK1BHUnpPbE5wWjI1bFpFbHVabTgrUEdSek9rTmhibTl1YVdOaGJHbDZZWFJwYjI1TlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXhMekV3TDNodGJDMWxlR010WXpFMGJpTWlMejQ4WkhNNlUybG5ibUYwZFhKbFRXVjBhRzlrSUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTNKellTMXphR0V4SWk4K1BHUnpPbEpsWm1WeVpXNWpaU0JWVWtrOUlpTmZPREJtT1dVMVpEY3ROek15WmkwME5tWTJMV0kwWldZdE5qTmlNMkUwTTJKak56YzBJajQ4WkhNNlZISmhibk5tYjNKdGN6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTJWdWRtVnNiM0JsWkMxemFXZHVZWFIxY21VaUx6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNUzh4TUM5NGJXd3RaWGhqTFdNeE5HNGpJaTgrUEM5a2N6cFVjbUZ1YzJadmNtMXpQanhrY3pwRWFXZGxjM1JOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBd0x6QTVMM2h0Ckhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.txt b/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.txt
new file mode 100644
index 0000000..63844ad
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 010 - invalid - without date.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.35678 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.b64 b/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.b64
new file mode 100644
index 0000000..020ff68
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.txt b/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.txt
new file mode 100644
index 0000000..94539cb
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 011 - invalid - with address.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&address=Switzerland HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.b64 b/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.b64
new file mode 100644
index 0000000..6f96115
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZwYXRpZW50LmlkZW50aWZpZXI9MTIzNCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.txt b/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.txt
new file mode 100644
index 0000000..6e10fa8
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 012 - invalid - with patient.identifier.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&patient.identifier=1234 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.b64 b/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.b64
new file mode 100644
index 0000000..6f96115
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZwYXRpZW50LmlkZW50aWZpZXI9MTIzNCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.txt b/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.txt
new file mode 100644
index 0000000..d4227d5
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 013 - invalid - with source.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&source=community HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.b64 b/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.b64
new file mode 100644
index 0000000..ec86ba8
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZ0eXBlPXJlcXVlc3QgSFRUUC8xLjEKQXV0aG9yaXphdGlvbjogQmVhcmVyIFBITmhiV3d5T2tGemMyVnlkR2x2YmlCNGJXeHVjenB6WVcxc01qMGlkWEp1T205aGMybHpPbTVoYldWek9uUmpPbE5CVFV3Nk1pNHdPbUZ6YzJWeWRHbHZiaUlnZUcxc2JuTTZlSE05SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhJaUI0Yld4dWN6cDRjMms5SW1oMGRIQTZMeTkzZDNjdWR6TXViM0puTHpJd01ERXZXRTFNVTJOb1pXMWhMV2x1YzNSaGJtTmxJaUJKUkQwaVh6Z3daamxsTldRM0xUY3pNbVl0TkRabU5pMWlOR1ZtTFRZellqTmhORE5pWXpjM05DSWdTWE56ZFdWSmJuTjBZVzUwUFNJeU1ESTBMVEF5TFRBNFZERTFPalF5T2pNeExqSTJNMW9pSUZabGNuTnBiMjQ5SWpJdU1DSStQSE5oYld3eU9rbHpjM1ZsY2o1b2RIUndjem92TDJWb1pXRnNkR2h6ZFdsemMyVXVhV2hsTFdWMWNtOXdaUzV1WlhRdlUxUlRQQzl6WVcxc01qcEpjM04xWlhJK1BHUnpPbE5wWjI1aGRIVnlaU0I0Yld4dWN6cGtjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JeUkrUEdSek9sTnBaMjVsWkVsdVptOCtQR1J6T2tOaGJtOXVhV05oYkdsNllYUnBiMjVOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBeEx6RXdMM2h0YkMxbGVHTXRZekUwYmlNaUx6NDhaSE02VTJsbmJtRjBkWEpsVFdWMGFHOWtJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JM0p6WVMxemFHRXhJaTgrUEdSek9sSmxabVZ5Wlc1alpTQlZVa2s5SWlOZk9EQm1PV1UxWkRjdE56TXlaaTAwTm1ZMkxXSTBaV1l0TmpOaU0yRTBNMkpqTnpjMElqNDhaSE02VkhKaGJuTm1iM0p0Y3o0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOHdPUzk0Yld4a2MybG5JMlZ1ZG1Wc2IzQmxaQzF6YVdkdVlYUjFjbVVpTHo0OFpITTZWSEpoYm5ObWIzSnRJRUZzWjI5eWFYUm9iVDBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01TOHhNQzk0Yld3dFpYaGpMV014Tkc0aklpOCtQQzlrY3pwVWNtRnVjMlp2Y20xelBqeGtjenBFYVdkbGMzUk5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF3THpBNUwzaHQKSG9zdDogZWhlYWx0aHN1aXNzZS5paGUtZXVyb3BlLm5ldA==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.txt b/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.txt
new file mode 100644
index 0000000..ea96e03
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 014 - invalid - with type.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&type=request HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.b64 b/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.b64
new file mode 100644
index 0000000..03d6fba
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZ1c2VyPVVzZXIxIEhUVFAvMS4xCkF1dGhvcml6YXRpb246IEJlYXJlciBQSE5oYld3eU9rRnpjMlZ5ZEdsdmJpQjRiV3h1Y3pwellXMXNNajBpZFhKdU9tOWhjMmx6T201aGJXVnpPblJqT2xOQlRVdzZNaTR3T21GemMyVnlkR2x2YmlJZ2VHMXNibk02ZUhNOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoSWlCNGJXeHVjenA0YzJrOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoTFdsdWMzUmhibU5sSWlCSlJEMGlYemd3WmpsbE5XUTNMVGN6TW1ZdE5EWm1OaTFpTkdWbUxUWXpZak5oTkROaVl6YzNOQ0lnU1hOemRXVkpibk4wWVc1MFBTSXlNREkwTFRBeUxUQTRWREUxT2pReU9qTXhMakkyTTFvaUlGWmxjbk5wYjI0OUlqSXVNQ0krUEhOaGJXd3lPa2x6YzNWbGNqNW9kSFJ3Y3pvdkwyVm9aV0ZzZEdoemRXbHpjMlV1YVdobExXVjFjbTl3WlM1dVpYUXZVMVJUUEM5ellXMXNNanBKYzNOMVpYSStQR1J6T2xOcFoyNWhkSFZ5WlNCNGJXeHVjenBrY3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSXlJK1BHUnpPbE5wWjI1bFpFbHVabTgrUEdSek9rTmhibTl1YVdOaGJHbDZZWFJwYjI1TlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXhMekV3TDNodGJDMWxlR010WXpFMGJpTWlMejQ4WkhNNlUybG5ibUYwZFhKbFRXVjBhRzlrSUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTNKellTMXphR0V4SWk4K1BHUnpPbEpsWm1WeVpXNWpaU0JWVWtrOUlpTmZPREJtT1dVMVpEY3ROek15WmkwME5tWTJMV0kwWldZdE5qTmlNMkUwTTJKak56YzBJajQ4WkhNNlZISmhibk5tYjNKdGN6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTJWdWRtVnNiM0JsWkMxemFXZHVZWFIxY21VaUx6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNUzh4TUM5NGJXd3RaWGhqTFdNeE5HNGpJaTgrUEM5a2N6cFVjbUZ1YzJadmNtMXpQanhrY3pwRWFXZGxjM1JOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBd0x6QTVMM2h0Ckhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.txt b/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.txt
new file mode 100644
index 0000000..07b2d30
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 015 - invalid - with user.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&user=User1 HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.b64 b/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.b64
new file mode 100644
index 0000000..9a93cf3
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZvdXRjb21lPXJlc3VsdCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIgUEhOaGJXd3lPa0Z6YzJWeWRHbHZiaUI0Yld4dWN6cHpZVzFzTWowaWRYSnVPbTloYzJsek9tNWhiV1Z6T25Sak9sTkJUVXc2TWk0d09tRnpjMlZ5ZEdsdmJpSWdlRzFzYm5NNmVITTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaElpQjRiV3h1Y3pwNGMyazlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURFdldFMU1VMk5vWlcxaExXbHVjM1JoYm1ObElpQkpSRDBpWHpnd1pqbGxOV1EzTFRjek1tWXRORFptTmkxaU5HVm1MVFl6WWpOaE5ETmlZemMzTkNJZ1NYTnpkV1ZKYm5OMFlXNTBQU0l5TURJMExUQXlMVEE0VkRFMU9qUXlPak14TGpJMk0xb2lJRlpsY25OcGIyNDlJakl1TUNJK1BITmhiV3d5T2tsemMzVmxjajVvZEhSd2N6b3ZMMlZvWldGc2RHaHpkV2x6YzJVdWFXaGxMV1YxY205d1pTNXVaWFF2VTFSVFBDOXpZVzFzTWpwSmMzTjFaWEkrUEdSek9sTnBaMjVoZEhWeVpTQjRiV3h1Y3pwa2N6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkl5SStQR1J6T2xOcFoyNWxaRWx1Wm04K1BHUnpPa05oYm05dWFXTmhiR2w2WVhScGIyNU5aWFJvYjJRZ1FXeG5iM0pwZEdodFBTSm9kSFJ3T2k4dmQzZDNMbmN6TG05eVp5OHlNREF4THpFd0wzaHRiQzFsZUdNdFl6RTBiaU1pTHo0OFpITTZVMmxuYm1GMGRYSmxUV1YwYUc5a0lFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkzSnpZUzF6YUdFeElpOCtQR1J6T2xKbFptVnlaVzVqWlNCVlVrazlJaU5mT0RCbU9XVTFaRGN0TnpNeVppMDBObVkyTFdJMFpXWXROak5pTTJFME0ySmpOemMwSWo0OFpITTZWSEpoYm5ObWIzSnRjejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM4d09TOTRiV3hrYzJsbkkyVnVkbVZzYjNCbFpDMXphV2R1WVhSMWNtVWlMejQ4WkhNNlZISmhibk5tYjNKdElFRnNaMjl5YVhSb2JUMGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TVM4eE1DOTRiV3d0WlhoakxXTXhORzRqSWk4K1BDOWtjenBVY21GdWMyWnZjbTF6UGp4a2N6cEVhV2RsYzNSTlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXdMekE1TDNodApIb3N0OiBlaGVhbHRoc3Vpc3NlLmloZS1ldXJvcGUubmV0YQ==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.txt b/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.txt
new file mode 100644
index 0000000..37a3767
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 016 - invalid - with outcome.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&outcome=result HTTP/1.1
+Authorization: Bearer PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.b64 b/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.b64
new file mode 100644
index 0000000..117a20d
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3IEhUVFAvMS4xCkhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.txt b/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.txt
new file mode 100644
index 0000000..42b9d47
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 017 - invalid - without Authorization.txt	
@@ -0,0 +1,2 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C567 HTTP/1.1
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.b64 b/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.b64
new file mode 100644
index 0000000..a5b3cf7
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZvdXRjb21lPXJlc3VsdCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXIKSG9zdDogZWhlYWx0aHN1aXNzZS5paGUtZXVyb3BlLm5ldA==
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.txt b/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.txt
new file mode 100644
index 0000000..db30547
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 018 - invalid - with bad Authorization.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&outcome=result HTTP/1.1
+Authorization: Bearer
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.b64 b/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.b64
new file mode 100644
index 0000000..2b9c342
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZvdXRjb21lPXJlc3VsdCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBQSE5oYld3eU9rRnpjMlZ5ZEdsdmJpQjRiV3h1Y3pwellXMXNNajBpZFhKdU9tOWhjMmx6T201aGJXVnpPblJqT2xOQlRVdzZNaTR3T21GemMyVnlkR2x2YmlJZ2VHMXNibk02ZUhNOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoSWlCNGJXeHVjenA0YzJrOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoTFdsdWMzUmhibU5sSWlCSlJEMGlYemd3WmpsbE5XUTNMVGN6TW1ZdE5EWm1OaTFpTkdWbUxUWXpZak5oTkROaVl6YzNOQ0lnU1hOemRXVkpibk4wWVc1MFBTSXlNREkwTFRBeUxUQTRWREUxT2pReU9qTXhMakkyTTFvaUlGWmxjbk5wYjI0OUlqSXVNQ0krUEhOaGJXd3lPa2x6YzNWbGNqNW9kSFJ3Y3pvdkwyVm9aV0ZzZEdoemRXbHpjMlV1YVdobExXVjFjbTl3WlM1dVpYUXZVMVJUUEM5ellXMXNNanBKYzNOMVpYSStQR1J6T2xOcFoyNWhkSFZ5WlNCNGJXeHVjenBrY3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSXlJK1BHUnpPbE5wWjI1bFpFbHVabTgrUEdSek9rTmhibTl1YVdOaGJHbDZZWFJwYjI1TlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXhMekV3TDNodGJDMWxlR010WXpFMGJpTWlMejQ4WkhNNlUybG5ibUYwZFhKbFRXVjBhRzlrSUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTNKellTMXphR0V4SWk4K1BHUnpPbEpsWm1WeVpXNWpaU0JWVWtrOUlpTmZPREJtT1dVMVpEY3ROek15WmkwME5tWTJMV0kwWldZdE5qTmlNMkUwTTJKak56YzBJajQ4WkhNNlZISmhibk5tYjNKdGN6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTJWdWRtVnNiM0JsWkMxemFXZHVZWFIxY21VaUx6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNUzh4TUM5NGJXd3RaWGhqTFdNeE5HNGpJaTgrUEM5a2N6cFVjbUZ1YzJadmNtMXpQanhrY3pwRWFXZGxjM1JOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBd0x6QTVMM2h0Ckhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.txt b/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.txt
new file mode 100644
index 0000000..14c2fae
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 019 - invalid - with bad Authorization.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&outcome=result HTTP/1.1
+Authorization: PHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.b64 b/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.b64
new file mode 100644
index 0000000..1f82a44
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.b64	
@@ -0,0 +1 @@
+R0VUIEFSUnNlcnZpY2UvQXVkaXRFdmVudD9kYXRlPWdlMjAyMC0wMy0yMiZkYXRlPWxlMjAyNS0wMy0yMiZlbnRpdHkuaWRlbnRpZmllcj11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC4zJTdDNTY3OCZvdXRjb21lPXJlc3VsdCBIVFRQLzEuMQpBdXRob3JpemF0aW9uOiBCZWFyZXJQSE5oYld3eU9rRnpjMlZ5ZEdsdmJpQjRiV3h1Y3pwellXMXNNajBpZFhKdU9tOWhjMmx6T201aGJXVnpPblJqT2xOQlRVdzZNaTR3T21GemMyVnlkR2x2YmlJZ2VHMXNibk02ZUhNOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoSWlCNGJXeHVjenA0YzJrOUltaDBkSEE2THk5M2QzY3Vkek11YjNKbkx6SXdNREV2V0UxTVUyTm9aVzFoTFdsdWMzUmhibU5sSWlCSlJEMGlYemd3WmpsbE5XUTNMVGN6TW1ZdE5EWm1OaTFpTkdWbUxUWXpZak5oTkROaVl6YzNOQ0lnU1hOemRXVkpibk4wWVc1MFBTSXlNREkwTFRBeUxUQTRWREUxT2pReU9qTXhMakkyTTFvaUlGWmxjbk5wYjI0OUlqSXVNQ0krUEhOaGJXd3lPa2x6YzNWbGNqNW9kSFJ3Y3pvdkwyVm9aV0ZzZEdoemRXbHpjMlV1YVdobExXVjFjbTl3WlM1dVpYUXZVMVJUUEM5ellXMXNNanBKYzNOMVpYSStQR1J6T2xOcFoyNWhkSFZ5WlNCNGJXeHVjenBrY3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSXlJK1BHUnpPbE5wWjI1bFpFbHVabTgrUEdSek9rTmhibTl1YVdOaGJHbDZZWFJwYjI1TlpYUm9iMlFnUVd4bmIzSnBkR2h0UFNKb2RIUndPaTh2ZDNkM0xuY3pMbTl5Wnk4eU1EQXhMekV3TDNodGJDMWxlR010WXpFMGJpTWlMejQ4WkhNNlUybG5ibUYwZFhKbFRXVjBhRzlrSUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTNKellTMXphR0V4SWk4K1BHUnpPbEpsWm1WeVpXNWpaU0JWVWtrOUlpTmZPREJtT1dVMVpEY3ROek15WmkwME5tWTJMV0kwWldZdE5qTmlNMkUwTTJKak56YzBJajQ4WkhNNlZISmhibk5tYjNKdGN6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzh3T1M5NGJXeGtjMmxuSTJWdWRtVnNiM0JsWkMxemFXZHVZWFIxY21VaUx6NDhaSE02VkhKaGJuTm1iM0p0SUVGc1oyOXlhWFJvYlQwaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNUzh4TUM5NGJXd3RaWGhqTFdNeE5HNGpJaTgrUEM5a2N6cFVjbUZ1YzJadmNtMXpQanhrY3pwRWFXZGxjM1JOWlhSb2IyUWdRV3huYjNKcGRHaHRQU0pvZEhSd09pOHZkM2QzTG5jekxtOXlaeTh5TURBd0x6QTVMM2h0Ckhvc3Q6IGVoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQ=
\ No newline at end of file
diff --git a/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.txt b/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.txt
new file mode 100644
index 0000000..87a7daa
--- /dev/null
+++ b/EHS/samples/ATC/CH-ATC - 020 - invalid - with bad Authorization.txt	
@@ -0,0 +1,3 @@
+GET ARRservice/AuditEvent?date=ge2020-03-22&date=le2025-03-22&entity.identifier=urn:oid:2.16.756.5.30.1.127.3.10.3%7C5678&outcome=result HTTP/1.1
+Authorization: BearerPHNhbWwyOkFzc2VydGlvbiB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiBJRD0iXzgwZjllNWQ3LTczMmYtNDZmNi1iNGVmLTYzYjNhNDNiYzc3NCIgSXNzdWVJbnN0YW50PSIyMDI0LTAyLTA4VDE1OjQyOjMxLjI2M1oiIFZlcnNpb249IjIuMCI+PHNhbWwyOklzc3Vlcj5odHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvU1RTPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODBmOWU1ZDctNzMyZi00NmY2LWI0ZWYtNjNiM2E0M2JjNzc0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
+Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
diff --git a/EHS/samples/CH_ITI-104.txt b/EHS/samples/CH-PIXm/CH_ITI-104.txt
similarity index 100%
rename from EHS/samples/CH_ITI-104.txt
rename to EHS/samples/CH-PIXm/CH_ITI-104.txt
diff --git a/EHS/samples/CH_ITI-83.txt b/EHS/samples/CH-PIXm/CH_ITI-83.txt
similarity index 100%
rename from EHS/samples/CH_ITI-83.txt
rename to EHS/samples/CH-PIXm/CH_ITI-83.txt
diff --git a/EHS/validationProfiles/CH-ITI-83-PostRequest-ValidationProfile.json b/EHS/validationProfiles/CH-ITI-83-PostRequest-ValidationProfile.json
deleted file mode 100644
index c49b7c0..0000000
--- a/EHS/validationProfiles/CH-ITI-83-PostRequest-ValidationProfile.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "profileType": "HTTPREQUEST",
-    "id": "CH_ITI-83_POST_PIXm_Query",
-    "name": "CH-83_HTTP_POST_Request",
-    "description": "Validation Profile for validating a POST PIXm Query",
-    "context": "EPR",
-    "assertions": [
-        {
-            "selector": "request.method",
-            "id": "PostMethodChecking",
-            "description": "HTTP method shall be POST",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-                {
-                    "type": "FIXEDVALUE",
-                    "fixedValue": "POST"
-                }
-            ]
-        },
-        {
-            "selector": "request.version",
-            "id": "HTTP1VersionChecking",
-            "description": "The HTTP version shall be HTTP/1.1 ",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "FIXEDVALUE",
-                "fixedValue": "HTTP/1.1"
-              }
-            ]
-          },
-          {
-              "selector": "request.uri.path",
-              "id": "URIRegexChecking",
-              "description": "URI path of the request shall match '^(\\/[^\\/\\s]+)+\\/\\$ihe_pix$' regex",
-              "requirementPriority": "MANDATORY",
-              "checksComposition": "oneOf",
-              "checks": [
-                  {
-                      "type": "REGEX",
-                      "regex": "^(\\/[^\\/\\s]+)+\\/\\$ihe_pix$"
-                  }
-              ]
-          },
-          {
-            "selector": "request.headers('Host').values",
-            "id": "HostChecking",
-            "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\/]+$",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "REGEX",
-                "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\/]+$"
-              }
-            ]
-          },
-          {
-            "selector": "request.headers('Authorization').values",
-            "id": "Authorization_parameter_presence",
-            "description": "The Authorization parameter is mandatory.",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "OCCURRENCE",
-                "minOccurrence": 1,
-                "maxOccurrence": 1
-              }
-            ]
-          },
-          {
-            "selector": "request.headers('Authorization').values",
-            "id": "Authorization_parameter_value",
-            "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "REGEX",
-                "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
-              }
-            ]
-          },
-          {
-            "selector": "request.uri.queryParams('sourceIdentifier').values",
-            "id": "sourceIdentifier_parameter_presence",
-            "description": "One and only one sourceIdentifier parameter is required.",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "OCCURRENCE",
-                "minOccurrence": 1,
-                "maxOccurrence": 1
-              }
-            ]
-          },
-          {
-            "selector": "request.uri.queryParams('sourceIdentifier').values",
-            "id": "sourceIdentifier_parameter_value",
-            "description": "sourceIdentifier parameter's value is composed by the Assigning Authority, a pipe and the patient identifier. regex: '^\\S+\\|\\S+$'",
-            "requirementPriority": "MANDATORY",
-            "checksComposition": "oneOf",
-            "checks": [
-              {
-                "type": "REGEX",
-                "regex": "^\\S+\\|\\S+$"
-              }
-            ]
-          }
-    ]
-}
\ No newline at end of file
diff --git a/IHE Validation profiles/IHE-ITI-104-PatientFeed-ValidationProfile.json b/IHE Validation profiles/PIXm/IHE-ITI-104-PatientFeed-ValidationProfile.json
similarity index 100%
rename from IHE Validation profiles/IHE-ITI-104-PatientFeed-ValidationProfile.json
rename to IHE Validation profiles/PIXm/IHE-ITI-104-PatientFeed-ValidationProfile.json
diff --git a/IHE Validation profiles/IHE-ITI-83-GetRequest-ValidationProfile.json b/IHE Validation profiles/PIXm/IHE-ITI-83-GetRequest-ValidationProfile.json
similarity index 100%
rename from IHE Validation profiles/IHE-ITI-83-GetRequest-ValidationProfile.json
rename to IHE Validation profiles/PIXm/IHE-ITI-83-GetRequest-ValidationProfile.json
diff --git a/IHE Validation profiles/IHE-ITI-83-PostRequest-ValidationProfile.json b/IHE Validation profiles/PIXm/IHE-ITI-83-PostRequest-ValidationProfile.json
similarity index 100%
rename from IHE Validation profiles/IHE-ITI-83-PostRequest-ValidationProfile.json
rename to IHE Validation profiles/PIXm/IHE-ITI-83-PostRequest-ValidationProfile.json
diff --git a/IHE Validation profiles/samples/IHE_ITI-104_AddReviseWithIUA_sample.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-104_AddReviseWithIUA_sample.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-104_AddReviseWithIUA_sample.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-104_AddReviseWithIUA_sample.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-104_AddRevise_sample.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-104_AddRevise_sample.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-104_AddRevise_sample.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-104_AddRevise_sample.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-104_Delete_sample.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-104_Delete_sample.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-104_Delete_sample.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-104_Delete_sample.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-104_Merge_sample.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-104_Merge_sample.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-104_Merge_sample.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-104_Merge_sample.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 001 - valid -GET request without targetSystem.b64 b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 001 - valid -GET request without targetSystem.b64
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 001 - valid -GET request without targetSystem.b64
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 001 - valid -GET request without targetSystem.b64
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 001 - valid -GET request without targetSystem.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 001 - valid -GET request without targetSystem.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 001 - valid -GET request without targetSystem.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 001 - valid -GET request without targetSystem.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 002 - valid -GET request with 1 targetSystem.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 002 - valid -GET request with 1 targetSystem.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 002 - valid -GET request with 1 targetSystem.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 002 - valid -GET request with 1 targetSystem.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 003 - valid -GET request with 3 targetSystem.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 003 - valid -GET request with 3 targetSystem.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 003 - valid -GET request with 3 targetSystem.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 003 - valid -GET request with 3 targetSystem.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 004 - valid -GET request with 1 targetSystem + XML format.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 004 - valid -GET request with 1 targetSystem + XML format.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 004 - valid -GET request with 1 targetSystem + XML format.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 004 - valid -GET request with 1 targetSystem + XML format.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 005 - valid -GET request with 3 targetSystem + JSON format.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 005 - valid -GET request with 3 targetSystem + JSON format.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 005 - valid -GET request with 3 targetSystem + JSON format.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 005 - valid -GET request with 3 targetSystem + JSON format.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.b64 b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.b64
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.b64
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.b64
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 006 - valid -GET request with 3 targetSystem + JSON format + IUA token.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 007 - invalid - Get request with bad sourceIdentifier.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 007 - invalid - Get request with bad sourceIdentifier.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 007 - invalid - Get request with bad sourceIdentifier.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 007 - invalid - Get request with bad sourceIdentifier.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 008 - invalid - Get request with bad targetSystem.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 008 - invalid - Get request with bad targetSystem.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 008 - invalid - Get request with bad targetSystem.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 008 - invalid - Get request with bad targetSystem.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 009 - invalid - Get request with bad _format.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 009 - invalid - Get request with bad _format.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 009 - invalid - Get request with bad _format.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 009 - invalid - Get request with bad _format.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 010 - invalid - Get request with bad IUA token.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 010 - invalid - Get request with bad IUA token.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 010 - invalid - Get request with bad IUA token.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 010 - invalid - Get request with bad IUA token.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 011 - invalid - Get request with bad IUA token.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 011 - invalid - Get request with bad IUA token.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 011 - invalid - Get request with bad IUA token.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 011 - invalid - Get request with bad IUA token.txt
diff --git a/IHE Validation profiles/samples/IHE_ITI-83 - 012 - invalid - Get request with bad IUA token.txt b/IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 012 - invalid - Get request with bad IUA token.txt
similarity index 100%
rename from IHE Validation profiles/samples/IHE_ITI-83 - 012 - invalid - Get request with bad IUA token.txt
rename to IHE Validation profiles/samples/PIXm/IHE_ITI-83 - 012 - invalid - Get request with bad IUA token.txt
-- 
GitLab