From 52e18d64176a2ded0c2581f2a254963d6c7ee70f Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Fri, 5 Sep 2025 12:33:18 +0200
Subject: [PATCH 01/20] Added testscripts (concept) for NL PS GPI

---
 .../PHR-Client/nl-ps-gpi-test-1-1-client.xml  | 15 +++++++++++
 .../XIS-Server/nl-ps-gpi-test-1-1-server.xml  | 17 ++++++++++++
 .../Test/_reference/resources/patient-.xml    | 27 +++++++++++++++++++
 .../Test/build-NL-PS-GPI-1-0-Test.bat         |  5 ++++
 .../Test/build-NL-PS-GPI-1-0-Test.sh          |  2 ++
 src/NL-PS-GPI-1.0/Test/build.properties       |  2 ++
 6 files changed, 68 insertions(+)
 create mode 100644 src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
 create mode 100644 src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
 create mode 100644 src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml
 create mode 100644 src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat
 create mode 100644 src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh
 create mode 100644 src/NL-PS-GPI-1.0/Test/build.properties

diff --git a/src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
new file mode 100644
index 0000000000..9bb091a3f9
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="client">
+    <id value="nl-ps-gpi-retrieve-test-1-1"/>
+    <version value="r4-1.0.0"/>
+    <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
+    <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
+    <nts:authToken patientResourceId="patient-"/>
+    
+    <test>       
+        <name value="Scenario 1.1 - Patient Information"/>
+        <description value="Query Immunization resource"/>
+        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>
+    </test>
+</TestScript>
diff --git a/src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
new file mode 100644
index 0000000000..669b877e13
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="server">
+    <id value="nl-ps-gpi-serve-test-1-1"/>
+    <version value="R4-4.0.1"/>
+    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1"/>
+    <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
+    <nts:authToken patientResourceId="patient-"/>
+    
+    <test id="1 - serve General Patient Information">
+        <name value="Test scenario 1.1 - Patient Information"/>
+        <description value="Serve NL-PS General Patient Information resources"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?"/>
+        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>   
+        <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
+    </test>
+</TestScript>
diff --git a/src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml b/src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml
new file mode 100644
index 0000000000..6f78531f47
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml
@@ -0,0 +1,27 @@
+<Patient xmlns="http://hl7.org/fhir">
+   <id value="patient-"/>
+   <meta>
+      <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Patient"/>
+   </meta>
+   <name>
+      <use value="official"/>
+      <text value="Reebeen"/>
+      <family value="Reebeen">
+         <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name">
+            <valueString value="Reebeen"/>
+         </extension>
+      </family>
+   </name>
+   <gender value="female">
+      <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-CodeSpecification">
+         <valueCodeableConcept>
+            <coding>
+               <system value="http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender"/>
+               <code value="F"/>
+               <display value="Female"/>
+            </coding>
+         </valueCodeableConcept>
+      </extension>
+   </gender>
+   <birthDate value="1985-08-04"/>
+</Patient>
diff --git a/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat b/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat
new file mode 100644
index 0000000000..a97e2e0b47
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat
@@ -0,0 +1,5 @@
+@setlocal enableextensions
+@echo off
+
+call ant -f ..\..\build-single.xml -propertyfile build.properties %*
+pause
\ No newline at end of file
diff --git a/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh b/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh
new file mode 100644
index 0000000000..ad108d33e2
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+ant -f ../../build-single.xml -propertyfile build.properties $*
diff --git a/src/NL-PS-GPI-1.0/Test/build.properties b/src/NL-PS-GPI-1.0/Test/build.properties
new file mode 100644
index 0000000000..bf7d27a297
--- /dev/null
+++ b/src/NL-PS-GPI-1.0/Test/build.properties
@@ -0,0 +1,2 @@
+input.dir = src/NL-PS-GPI-1-0/Test
+output.dir = output/R4/NL-PS-GPI-1-0/Test
\ No newline at end of file

From 51e72ab4b957be91d13a263e262c150caf20fbc2 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 08:23:05 +0200
Subject: [PATCH 02/20] Map name change

---
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml           | 0
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml           | 6 +++---
 .../Test/_reference/resources/patient-.xml                  | 0
 .../Test/build-NL-PS-GPI-1-0-Test.bat                       | 0
 .../Test/build-NL-PS-GPI-1-0-Test.sh                        | 0
 src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/build.properties  | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml (100%)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml (95%)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/_reference/resources/patient-.xml (100%)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/build-NL-PS-GPI-1-0-Test.bat (100%)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/build-NL-PS-GPI-1-0-Test.sh (100%)
 rename src/{NL-PS-GPI-1.0 => NL-PS-GPI-1-0}/Test/build.properties (100%)

diff --git a/src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
similarity index 100%
rename from src/NL-PS-GPI-1.0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
rename to src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
diff --git a/src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
similarity index 95%
rename from src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
rename to src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 669b877e13..cbb6ab40ca 100644
--- a/src/NL-PS-GPI-1.0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -6,12 +6,12 @@
     <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
-    
+
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?"/>
-        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>   
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?patient"/>
+        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>
 </TestScript>
diff --git a/src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml b/src/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml
similarity index 100%
rename from src/NL-PS-GPI-1.0/Test/_reference/resources/patient-.xml
rename to src/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml
diff --git a/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat b/src/NL-PS-GPI-1-0/Test/build-NL-PS-GPI-1-0-Test.bat
similarity index 100%
rename from src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.bat
rename to src/NL-PS-GPI-1-0/Test/build-NL-PS-GPI-1-0-Test.bat
diff --git a/src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh b/src/NL-PS-GPI-1-0/Test/build-NL-PS-GPI-1-0-Test.sh
similarity index 100%
rename from src/NL-PS-GPI-1.0/Test/build-NL-PS-GPI-1-0-Test.sh
rename to src/NL-PS-GPI-1-0/Test/build-NL-PS-GPI-1-0-Test.sh
diff --git a/src/NL-PS-GPI-1.0/Test/build.properties b/src/NL-PS-GPI-1-0/Test/build.properties
similarity index 100%
rename from src/NL-PS-GPI-1.0/Test/build.properties
rename to src/NL-PS-GPI-1-0/Test/build.properties

From 0b80cee8a447795c539f5a44ad7eab9bbad7f06d Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 09:05:46 +0200
Subject: [PATCH 03/20] Generated scripts

---
 Configuration/QualificationTokens.json        |   8 +-
 .../PHR-Client/nl-ps-gpi-test-1-1-client.xml  |  51 ++++
 .../Test/PHR-Client/properties.json           |   9 +
 .../nl-ps-gpi-test-1-1-server-json.xml        | 230 ++++++++++++++++++
 .../nl-ps-gpi-test-1-1-server-xml.xml         | 230 ++++++++++++++++++
 .../Test/XIS-Server/properties.json           |   9 +
 .../load-resources-purgecreateupdate-xml.xml  |  91 +++++++
 .../Test/_LoadResources/properties.json       |   6 +
 .../Test/_reference/resources/patient-.xml    |  33 +++
 ...sert_response_queryParamsInSelfLink.groovy |  39 +++
 src/NL-PS-GPI-1-0/Test/build.properties       |   5 +-
 11 files changed, 709 insertions(+), 2 deletions(-)
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/_LoadResources/load-resources-purgecreateupdate-xml.xml
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/_LoadResources/properties.json
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml
 create mode 100644 output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy

diff --git a/Configuration/QualificationTokens.json b/Configuration/QualificationTokens.json
index 151ca02018..2c951cf851 100644
--- a/Configuration/QualificationTokens.json
+++ b/Configuration/QualificationTokens.json
@@ -1308,5 +1308,11 @@
         "familyName": "XXX_Walsmit",
         "bsn": "999909162",
         "qualificationScript": "MP9 3-beta"
+    },
+	{
+        "accessToken": "Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7",
+        "resourceId": "patient-",
+        "familyName": "Reebeen",
+        "qualificationScript": "NL-PS-GPI-1-0"
     }
-]
+]
\ No newline at end of file
diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
new file mode 100644
index 0000000000..1c9c3a3fc2
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
+   <id value="nl-ps-gpi-retrieve-test-1-1"/>
+   <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-retrieve-test-1-1"/>
+   <version value="r4-1.0.0-patchlevel 2025.35"/>
+   <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="Nictiz"/>
+      <telecom>
+         <system value="email"/>
+         <value value="kwalificatie@nictiz.nl"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
+   <origin>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="true"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
+         <code value="FHIR-Client"/>
+      </profile>
+   </origin>
+   <destination>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="false"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
+         <code value="FHIR-Server"/>
+      </profile>
+   </destination>
+   <test>
+      <name value="Scenario 1.1 - Patient Information"/>
+      <description value="Query Immunization resource"/>
+      <action>
+         <assert>
+            <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(Patient)).count() = 1"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json
new file mode 100644
index 0000000000..73c51d5337
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json
@@ -0,0 +1,9 @@
+
+  { "goal" : "Test",
+    "fhirVersion" : "R4",
+    "informationStandard" : "NL-PS-GPI-1-0",
+    "usecase" : "NL-PS General Patient Information ",
+    "role" : 
+    { "name" : "PHR-Client",
+      "description" : "Personal Health Record (PHR\/PGO) in MedMij context" },
+    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
new file mode 100644
index 0000000000..3398344e07
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
+   <id value="nl-ps-gpi-serve-test-1-1-json"/>
+   <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
+      <extension url="ruleId">
+         <valueId value="assert-response-queryParamsInSelfLink"/>
+      </extension>
+      <extension url="path">
+         <valueString value="../_reference/rules/assert_response_queryParamsInSelfLink.groovy"/>
+      </extension>
+   </extension>
+   <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-json"/>
+   <version value="R4-4.0.1-patchlevel 2025.35"/>
+   <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - JSON Format"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="Nictiz"/>
+      <telecom>
+         <system value="email"/>
+         <value value="kwalificatie@nictiz.nl"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
+   <origin>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="false"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
+         <code value="FHIR-Client"/>
+      </profile>
+   </origin>
+   <destination>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="true"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
+         <code value="FHIR-Server"/>
+      </profile>
+   </destination>
+   <profile id="Bundle-profile"
+            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
+   <variable>
+      <name value="patient-token-id"/>
+      <defaultValue value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
+      <description value="OAuth Token for current patient"/>
+   </variable>
+   <test id="1 - serve General Patient Information">
+      <name value="Test scenario 1.1 - Patient Information"/>
+      <description value="Serve NL-PS General Patient Information resources"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://hl7.org/fhir/restful-interaction"/>
+               <code value="search"/>
+            </type>
+            <resource value="Patient"/>
+            <description value="Test Server to serve Patient resources."/>
+            <accept value="json"/>
+            <destination value="1"/>
+            <encodeRequestUrl value="true"/>
+            <origin value="1"/>
+            <params value="?patient"/>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the operation was successful"/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned resource type is Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle type is searchset."/>
+            <direction value="response"/>
+            <expression value="Bundle.type"/>
+            <operator value="equals"/>
+            <stopTestOnFail value="false"/>
+            <value value="searchset"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
+            <direction value="response"/>
+            <stopTestOnFail value="false"/>
+            <validateProfileId value="Bundle-profile"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
+            <direction value="response"/>
+            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle contains a self link."/>
+            <direction value="response"/>
+            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-rule">
+               <extension url="ruleId">
+                  <valueId value="assert-response-queryParamsInSelfLink"/>
+               </extension>
+            </extension>
+            <description value="Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link."/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="true"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(Patient)).count() = 1"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
new file mode 100644
index 0000000000..c23cc375bc
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
+   <id value="nl-ps-gpi-serve-test-1-1-xml"/>
+   <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
+      <extension url="ruleId">
+         <valueId value="assert-response-queryParamsInSelfLink"/>
+      </extension>
+      <extension url="path">
+         <valueString value="../_reference/rules/assert_response_queryParamsInSelfLink.groovy"/>
+      </extension>
+   </extension>
+   <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-xml"/>
+   <version value="R4-4.0.1-patchlevel 2025.35"/>
+   <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - XML Format"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="Nictiz"/>
+      <telecom>
+         <system value="email"/>
+         <value value="kwalificatie@nictiz.nl"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
+   <origin>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="false"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
+         <code value="FHIR-Client"/>
+      </profile>
+   </origin>
+   <destination>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="true"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
+         <code value="FHIR-Server"/>
+      </profile>
+   </destination>
+   <profile id="Bundle-profile"
+            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
+   <variable>
+      <name value="patient-token-id"/>
+      <defaultValue value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
+      <description value="OAuth Token for current patient"/>
+   </variable>
+   <test id="1 - serve General Patient Information">
+      <name value="Test scenario 1.1 - Patient Information"/>
+      <description value="Serve NL-PS General Patient Information resources"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://hl7.org/fhir/restful-interaction"/>
+               <code value="search"/>
+            </type>
+            <resource value="Patient"/>
+            <description value="Test Server to serve Patient resources."/>
+            <accept value="xml"/>
+            <destination value="1"/>
+            <encodeRequestUrl value="true"/>
+            <origin value="1"/>
+            <params value="?patient"/>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the operation was successful"/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned resource type is Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle type is searchset."/>
+            <direction value="response"/>
+            <expression value="Bundle.type"/>
+            <operator value="equals"/>
+            <stopTestOnFail value="false"/>
+            <value value="searchset"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
+            <direction value="response"/>
+            <stopTestOnFail value="false"/>
+            <validateProfileId value="Bundle-profile"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
+            <direction value="response"/>
+            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
+            <direction value="response"/>
+            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned Bundle contains a self link."/>
+            <direction value="response"/>
+            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-rule">
+               <extension url="ruleId">
+                  <valueId value="assert-response-queryParamsInSelfLink"/>
+               </extension>
+            </extension>
+            <description value="Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link."/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="true"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(Patient)).count() = 1"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json
new file mode 100644
index 0000000000..b0a388db8f
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json
@@ -0,0 +1,9 @@
+
+  { "goal" : "Test",
+    "fhirVersion" : "R4",
+    "informationStandard" : "NL-PS-GPI-1-0",
+    "usecase" : "NL-PS General Patient Information ",
+    "role" : 
+    { "name" : "XIS-Server",
+      "description" : "XIS (DVA) in MedMij context" },
+    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/load-resources-purgecreateupdate-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/load-resources-purgecreateupdate-xml.xml
new file mode 100644
index 0000000000..d1a1513c2d
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/load-resources-purgecreateupdate-xml.xml
@@ -0,0 +1,91 @@
+<TestScript xmlns="http://hl7.org/fhir">
+   <id value="resources-purgecreateupdate-xml"/>
+   <url value="http://nictiz.nl/fhir/TestScript/load-resources-purgecreateupdate-xml"/>
+   <name value="Load Test Resources - Purge Create Update - XML"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="MedMij"/>
+      <telecom>
+         <system value="email"/>
+         <value value="kwalificatie@nictiz.nl"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Load test resources using the update (PUT) operation of the target FHIR server for use in testing. All resource ids are pre-defined. The target XIS FHIR server is expected to support resource create via the update (PUT) operation for client assigned ids. "/>
+   <copyright value="© Nictiz 2020"/>
+   <fixture id="Patient-patient-">
+      <autocreate value="false"/>
+      <autodelete value="false"/>
+      <resource>
+         <reference value="../_reference/resources/patient-.xml"/>
+      </resource>
+   </fixture>
+   <variable>
+      <name value="Patient-patient--id"/>
+      <expression value="Patient.id"/>
+      <sourceId value="Patient-patient-"/>
+   </variable>
+   <variable>
+      <name value="T"/>
+      <defaultValue value="${CURRENTDATE}"/>
+      <description value="Date that data and queries are expected to be relative to."/>
+   </variable>
+   <setup>
+      <action>
+         <operation>
+            <type>
+               <system value="http://touchstone.com/fhir/extended-operation-codes"/>
+               <code value="purge"/>
+            </type>
+            <resource value="Patient"/>
+            <accept value="xml"/>
+            <contentType value="xml"/>
+            <encodeRequestUrl value="true"/>
+            <params value="patient-/$purge"/>
+            <requestHeader>
+               <field value="Authorization"/>
+               <value value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
+            </requestHeader>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned HTTP status is 200(OK) or 204(No Content)"/>
+            <operator value="in"/>
+            <responseCode value="200,204"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </setup>
+   <test id="Step1-LoadTestResourceCreate">
+      <name value="Step1-LoadTestResourceCreate"/>
+      <description value="Load test resources using the update (PUT) operation of the target FHIR server for use in testing. All resource ids are pre-defined. The target XIS FHIR server is expected to support resource create via the update (PUT) operation for client assigned ids. "/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://terminology.hl7.org/CodeSystem/testscript-operation-codes"/>
+               <code value="updateCreate"/>
+            </type>
+            <resource value="Patient"/>
+            <accept value="xml"/>
+            <contentType value="xml"/>
+            <encodeRequestUrl value="true"/>
+            <params value="/${Patient-patient--id}"/>
+            <requestHeader>
+               <field value="Authorization"/>
+               <value value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
+            </requestHeader>
+            <sourceId value="Patient-patient-"/>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned HTTP status is 200(OK) or 201(Created)."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/properties.json b/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/properties.json
new file mode 100644
index 0000000000..b6f27e54b6
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/_LoadResources/properties.json
@@ -0,0 +1,6 @@
+
+  { "goal" : "Test",
+    "fhirVersion" : "R4",
+    "informationStandard" : "NL-PS-GPI-1-0",
+    "usecase" : "NL-PS General Patient Information ",
+    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml b/output/R4/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml
new file mode 100644
index 0000000000..eac32750c4
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/_reference/resources/patient-.xml
@@ -0,0 +1,33 @@
+<Patient xmlns="http://hl7.org/fhir">
+  <id value="patient-"/>
+  <meta>
+    <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-Patient"/>
+  </meta>
+  <text>
+    <status value="extensions"/>
+    <div xmlns="http://www.w3.org/1999/xhtml">
+      <div>Reebeen, Vrouw, 4 augustus 1985</div>
+    </div>
+  </text>
+  <name>
+    <use value="official"/>
+    <text value="Reebeen"/>
+    <family value="Reebeen">
+      <extension url="http://hl7.org/fhir/StructureDefinition/humanname-own-name">
+        <valueString value="Reebeen"/>
+      </extension>
+    </family>
+  </name>
+  <gender value="female">
+    <extension url="http://nictiz.nl/fhir/StructureDefinition/ext-CodeSpecification">
+      <valueCodeableConcept>
+        <coding>
+          <system value="http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender"/>
+          <code value="F"/>
+          <display value="Female"/>
+        </coding>
+      </valueCodeableConcept>
+    </extension>
+  </gender>
+  <birthDate value="1985-08-04"/>
+</Patient>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy b/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy
new file mode 100644
index 0000000000..fc5d9e1f1f
--- /dev/null
+++ b/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy
@@ -0,0 +1,39 @@
+/*
+ rule.summary=Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link. 
+  rule.description=Bundle.link.where(relation = 'self').url contains all parameters from the request URL.
+*/
+
+String[] reqParts = java.net.URLDecoder.decode(request.getURL()).split("\\?")
+if (reqParts.length > 0) {
+	String selfLink = java.net.URLDecoder.decode(response.getFhirPathValue("Bundle.link.where(relation = 'self').url"))
+    String reqParams = reqParts[1]
+    for (String reqParamFull : reqParams.split('&')) {
+        if (!selfLink.contains(reqParamFull)) { // See if the param and value are present verbatim in the self link
+
+            // If not, this might be due to the fact that the parameter is a reference that was rewritten by the
+            // server, either by adding the resource type or removing it. So let's see if the parameter value
+			// *looks* like a reference.
+            def (reqParam, reqVal) = reqParamFull.split('=')
+            def refPattern = /^([A-Z][A-Za-z]+\/)?([A-Za-z0-9\-\.]{1,64})$/
+            def asReference = reqVal =~ refPattern
+
+            def errorString = "The requested parameter ${reqParamFull} was absent from the self link"
+
+            if (!asReference) {
+                // Apparently, the request parameter wasn't a reference
+                fail(errorString)
+            } else {
+                if (asReference[0][1] == null) {
+                    // Resource type was not present in the request, so let's see if we have a match _with_ something
+                    // that looks like a resource type.
+                    assert selfLink =~ /${reqParam}=[A-Z][A-Za-z]+\/${asReference[0][2]}/ : errorString
+                } else {
+                    // Resource type was present in the request, so let's see if we have a match without it.
+					// Note that this is not allowed if the reference can act on more than one resource type, but it's
+					// out of scope to test if this is the case.
+                    assert selfLink.contains("${reqParam}=${asReference[0][2]}") : errorString
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NL-PS-GPI-1-0/Test/build.properties b/src/NL-PS-GPI-1-0/Test/build.properties
index bf7d27a297..8752795881 100644
--- a/src/NL-PS-GPI-1-0/Test/build.properties
+++ b/src/NL-PS-GPI-1-0/Test/build.properties
@@ -1,2 +1,5 @@
 input.dir = src/NL-PS-GPI-1-0/Test
-output.dir = output/R4/NL-PS-GPI-1-0/Test
\ No newline at end of file
+output.dir = output/R4/NL-PS-GPI-1-0/Test
+informationStandard = NL-PS-GPI-1-0
+usecase = NL-PS General Patient Information 
+fhir.version = R4
\ No newline at end of file

From 4e4c5ec84ddf81122480bac3b3dff33bca693aac Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 09:23:28 +0200
Subject: [PATCH 04/20] Typo fix

---
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml           | 2 +-
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 1c9c3a3fc2..7e09ce74b9 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -37,7 +37,7 @@
    </destination>
    <test>
       <name value="Scenario 1.1 - Patient Information"/>
-      <description value="Query Immunization resource"/>
+      <description value="Patient resource"/>
       <action>
          <assert>
             <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 9bb091a3f9..7245145a52 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -6,10 +6,10 @@
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
-    
-    <test>       
+
+    <test>
         <name value="Scenario 1.1 - Patient Information"/>
-        <description value="Query Immunization resource"/>
+        <description value="Patient resource"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>
     </test>
 </TestScript>

From d389f8e8dc8fd5dbc6bf1db6e46e558fa7d8a7d5 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 10:00:36 +0200
Subject: [PATCH 05/20] typo fixes

---
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 4 ++--
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 7e09ce74b9..83229a09e2 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,7 +2,7 @@
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="nl-ps-gpi-retrieve-test-1-1"/>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-retrieve-test-1-1"/>
-   <version value="r4-1.0.0-patchlevel 2025.35"/>
+   <version value="R4-4.0.1-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -35,7 +35,7 @@
          <code value="FHIR-Server"/>
       </profile>
    </destination>
-   <test>
+   <test id="scenario-1-1-retrieve-patient">
       <name value="Scenario 1.1 - Patient Information"/>
       <description value="Patient resource"/>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 7245145a52..cf582cdcaa 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,12 +2,12 @@
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="client">
     <id value="nl-ps-gpi-retrieve-test-1-1"/>
-    <version value="r4-1.0.0"/>
+    <version value="R4-4.0.1"/>
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
 
-    <test>
+    <test id="scenario-1-1-retrieve-patient">
         <name value="Scenario 1.1 - Patient Information"/>
         <description value="Patient resource"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>

From cd8c9ea2182aee7fe525c639133f423460892953 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 10:39:12 +0200
Subject: [PATCH 06/20] param fix

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index cbb6ab40ca..07b99a4740 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?patient"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=patient"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 3b8205a7d4c09d6cbb1d4da6125568c07bc1d0e4 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 10:50:53 +0200
Subject: [PATCH 07/20] FHIR version typo

---
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml        | 4 ++--
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml         | 4 ++--
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 83229a09e2..1a812505e9 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,7 +2,7 @@
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="nl-ps-gpi-retrieve-test-1-1"/>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-retrieve-test-1-1"/>
-   <version value="R4-4.0.1-patchlevel 2025.35"/>
+   <version value="R4-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index 3398344e07..556c8e7e77 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -10,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-json"/>
-   <version value="R4-4.0.1-patchlevel 2025.35"/>
+   <version value="R4-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?patient"/>
+            <params value="?_include=patient"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index c23cc375bc..6c3a224fe2 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -10,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-xml"/>
-   <version value="R4-4.0.1-patchlevel 2025.35"/>
+   <version value="R4-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?patient"/>
+            <params value="?_include=patient"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index cf582cdcaa..3a4c70f4af 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="client">
     <id value="nl-ps-gpi-retrieve-test-1-1"/>
-    <version value="R4-4.0.1"/>
+    <version value="R4"/>
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 07b99a4740..4dfac5859e 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="server">
     <id value="nl-ps-gpi-serve-test-1-1"/>
-    <version value="R4-4.0.1"/>
+    <version value="R4"/>
     <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>

From c1f96b81358f421ea5d5e15c0466245240586bba Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:08:01 +0200
Subject: [PATCH 08/20] deleted param

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 4dfac5859e..f9929965a8 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=patient"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 3bf2108442457b9db7c9b61ec4ba0689dc788448 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:09:11 +0200
Subject: [PATCH 09/20] Param update

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index f9929965a8..84a3a543ef 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="Patient?_include=Patient:general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From b6f22a7f54f5601a1a8edbd176315bd716a2a321 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:30:39 +0200
Subject: [PATCH 10/20] Version typo fix

---
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml        | 4 ++--
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml         | 4 ++--
 .../Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml             | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 1a812505e9..bdce659184 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,7 +2,7 @@
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="nl-ps-gpi-retrieve-test-1-1"/>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-retrieve-test-1-1"/>
-   <version value="R4-patchlevel 2025.35"/>
+   <version value="r4-1.0.0-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index 556c8e7e77..f476e37529 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -10,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-json"/>
-   <version value="R4-patchlevel 2025.35"/>
+   <version value="r4-1.0.0-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=patient"/>
+            <params value="Patient?_include=Patient:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index 6c3a224fe2..c260aa1cf2 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -10,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-xml"/>
-   <version value="R4-patchlevel 2025.35"/>
+   <version value="r4-1.0.0-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=patient"/>
+            <params value="Patient?_include=Patient:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index 3a4c70f4af..b36e47c6cb 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="client">
     <id value="nl-ps-gpi-retrieve-test-1-1"/>
-    <version value="R4"/>
+    <version value="r4-1.0.0"/>
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 84a3a543ef..ec9b32d76e 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="server">
     <id value="nl-ps-gpi-serve-test-1-1"/>
-    <version value="R4"/>
+    <version value="r4-1.0.0"/>
     <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Serve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>

From 95c130c8af67840903f7cd423b9620ac91c623ce Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:36:21 +0200
Subject: [PATCH 11/20] query fix

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index ec9b32d76e..939e2bde44 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="Patient?_include=Patient:general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 1fafd223849178785e1fba5a766651e74ae3da83 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:41:56 +0200
Subject: [PATCH 12/20] Fix patient

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 939e2bde44..ec9b32d76e 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="Patient?_include=Patient:general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 4f677b38c2502d3c447ccf24cc5dff1a317c0cd0 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 11:46:35 +0200
Subject: [PATCH 13/20] Param fix

---
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index ec9b32d76e..939e2bde44 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="Patient?_include=Patient:general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 02a8defbe5cba014768f5f53bf0eafa972f17616 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 12:27:04 +0200
Subject: [PATCH 14/20] Client scripts update

---
 .../PHR-Client/nl-ps-gpi-test-1-1-client.xml  | 40 ++++++++++++++++++-
 .../nl-ps-gpi-test-1-1-server-json.xml        |  2 +-
 .../nl-ps-gpi-test-1-1-server-xml.xml         |  2 +-
 .../PHR-Client/nl-ps-gpi-test-1-1-client.xml  | 10 +++--
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index bdce659184..23ffd8eaa9 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -36,8 +36,44 @@
       </profile>
    </destination>
    <test id="scenario-1-1-retrieve-patient">
-      <name value="Scenario 1.1 - Patient Information"/>
-      <description value="Patient resource"/>
+      <name value="Scenario 1.1 - Patient"/>
+      <description value="Query Patient resource"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://hl7.org/fhir/restful-interaction"/>
+               <code value="search"/>
+            </type>
+            <resource value="Patient"/>
+            <description value="Test Client to retrieve Patient resources."/>
+            <destination value="1"/>
+            <encodeRequestUrl value="true"/>
+            <origin value="1"/>
+            <params value="?_include=Patient:general-practitioner"/>
+            <requestHeader>
+               <field value="Authorization"/>
+               <value value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
+            </requestHeader>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Make sure that the server of the test simulator gives a success response."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the server of the test simulator returns a Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index f476e37529..3ccbac150b 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="Patient?_include=Patient:general-practitioner"/>
+            <params value="?_include=Patient:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index c260aa1cf2..a5d9857142 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="Patient?_include=Patient:general-practitioner"/>
+            <params value="?_include=Patient:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
index b36e47c6cb..c30050992f 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
@@ -6,10 +6,12 @@
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
-
+   
     <test id="scenario-1-1-retrieve-patient">
-        <name value="Scenario 1.1 - Patient Information"/>
-        <description value="Patient resource"/>
-        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>
+        <name value="Scenario 1.1 - Patient"/>
+        <description value="Query Patient resource"/>
+        <nts:include value="test.client.search" scope="common" resource="Patient" params="?_include=Patient:general-practitioner" useToken="true"/>
+        <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>     
     </test>
 </TestScript>

From 2aabf727d554568eabb94bd596228935ffa1aebc Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 13:36:07 +0200
Subject: [PATCH 15/20] Param fix

---
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml          | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml           | 2 +-
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index 3ccbac150b..637ed26cea 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=Patient:general-practitioner"/>
+            <params value="?_include=general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index a5d9857142..ba307ab1ba 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=Patient:general-practitioner"/>
+            <params value="?_include=general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 939e2bde44..2050190bd2 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From b8028457ac7bcb4225446ddd074c1d0cdd95077c Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 13:40:54 +0200
Subject: [PATCH 16/20] Param edit fix

---
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml          | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml           | 2 +-
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index 637ed26cea..bc1be33b08 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=general-practitioner"/>
+            <params value="?_include=:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index ba307ab1ba..40cf61fa3c 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=general-practitioner"/>
+            <params value="?_include=:general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 2050190bd2..65a7d592c0 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=:general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 0515a6d0d7946a1b2c16f9ac44fbb34b2f6aac5c Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 13:47:47 +0200
Subject: [PATCH 17/20] Fixing param

---
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml          | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml           | 2 +-
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index bc1be33b08..637ed26cea 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=:general-practitioner"/>
+            <params value="?_include=general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index 40cf61fa3c..ba307ab1ba 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=:general-practitioner"/>
+            <params value="?_include=general-practitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 65a7d592c0..2050190bd2 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=:general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=general-practitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 70604f3d47f010c4848e905e190320782a840cf9 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 13:56:37 +0200
Subject: [PATCH 18/20] Param fixing

---
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml          | 2 +-
 .../Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml           | 2 +-
 src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index 637ed26cea..cc94cb93fb 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=general-practitioner"/>
+            <params value="?_include=Patient:generalPractitioner"/>
          </operation>
       </action>
       <action>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index ba307ab1ba..4f2de72f2a 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -65,7 +65,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=general-practitioner"/>
+            <params value="?_include=Patient:generalPractitioner"/>
          </operation>
       </action>
       <action>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index 2050190bd2..cbec58f1e9 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=general-practitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:generalPractitioner"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 81e597f1171bdd645e49e648f51f67ac37985e72 Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 14:02:41 +0200
Subject: [PATCH 19/20] deleted param

---
 .../nl-ps-gpi-test-1-1-server-json.xml        | 21 ----------
 .../nl-ps-gpi-test-1-1-server-xml.xml         | 21 ----------
 ...sert_response_queryParamsInSelfLink.groovy | 39 -------------------
 .../XIS-Server/nl-ps-gpi-test-1-1-server.xml  |  2 +-
 4 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy

diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
index cc94cb93fb..5d040b36ae 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="nl-ps-gpi-serve-test-1-1-json"/>
-   <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
-      <extension url="ruleId">
-         <valueId value="assert-response-queryParamsInSelfLink"/>
-      </extension>
-      <extension url="path">
-         <valueString value="../_reference/rules/assert_response_queryParamsInSelfLink.groovy"/>
-      </extension>
-   </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-json"/>
    <version value="r4-1.0.0-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - JSON Format"/>
@@ -65,7 +57,6 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=Patient:generalPractitioner"/>
          </operation>
       </action>
       <action>
@@ -205,18 +196,6 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-rule">
-               <extension url="ruleId">
-                  <valueId value="assert-response-queryParamsInSelfLink"/>
-               </extension>
-            </extension>
-            <description value="Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link."/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
       <action>
          <assert>
             <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
index 4f2de72f2a..fbec543a2f 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="nl-ps-gpi-serve-test-1-1-xml"/>
-   <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
-      <extension url="ruleId">
-         <valueId value="assert-response-queryParamsInSelfLink"/>
-      </extension>
-      <extension url="path">
-         <valueString value="../_reference/rules/assert_response_queryParamsInSelfLink.groovy"/>
-      </extension>
-   </extension>
    <url value="http://nictiz.nl/fhir/TestScript/nl-ps-gpi-serve-test-1-1-xml"/>
    <version value="r4-1.0.0-patchlevel 2025.35"/>
    <name value="NL-PS General Patient Information - XIS Server - Test scenario 1.1 - XML Format"/>
@@ -65,7 +57,6 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=Patient:generalPractitioner"/>
          </operation>
       </action>
       <action>
@@ -205,18 +196,6 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-rule">
-               <extension url="ruleId">
-                  <valueId value="assert-response-queryParamsInSelfLink"/>
-               </extension>
-            </extension>
-            <description value="Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link."/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
       <action>
          <assert>
             <description value="Confirm that the response Bundle contains 1 Patient resource(s). "/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy b/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy
deleted file mode 100644
index fc5d9e1f1f..0000000000
--- a/output/R4/NL-PS-GPI-1-0/Test/_reference/rules/assert_response_queryParamsInSelfLink.groovy
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- rule.summary=Confirm that the parameters in the request URL are all handled by the server, by inspecting the self link. 
-  rule.description=Bundle.link.where(relation = 'self').url contains all parameters from the request URL.
-*/
-
-String[] reqParts = java.net.URLDecoder.decode(request.getURL()).split("\\?")
-if (reqParts.length > 0) {
-	String selfLink = java.net.URLDecoder.decode(response.getFhirPathValue("Bundle.link.where(relation = 'self').url"))
-    String reqParams = reqParts[1]
-    for (String reqParamFull : reqParams.split('&')) {
-        if (!selfLink.contains(reqParamFull)) { // See if the param and value are present verbatim in the self link
-
-            // If not, this might be due to the fact that the parameter is a reference that was rewritten by the
-            // server, either by adding the resource type or removing it. So let's see if the parameter value
-			// *looks* like a reference.
-            def (reqParam, reqVal) = reqParamFull.split('=')
-            def refPattern = /^([A-Z][A-Za-z]+\/)?([A-Za-z0-9\-\.]{1,64})$/
-            def asReference = reqVal =~ refPattern
-
-            def errorString = "The requested parameter ${reqParamFull} was absent from the self link"
-
-            if (!asReference) {
-                // Apparently, the request parameter wasn't a reference
-                fail(errorString)
-            } else {
-                if (asReference[0][1] == null) {
-                    // Resource type was not present in the request, so let's see if we have a match _with_ something
-                    // that looks like a resource type.
-                    assert selfLink =~ /${reqParam}=[A-Z][A-Za-z]+\/${asReference[0][2]}/ : errorString
-                } else {
-                    // Resource type was present in the request, so let's see if we have a match without it.
-					// Note that this is not allowed if the reference can act on more than one resource type, but it's
-					// out of scope to test if this is the case.
-                    assert selfLink.contains("${reqParam}=${asReference[0][2]}") : errorString
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
index cbec58f1e9..d1237b9c6e 100644
--- a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
+++ b/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
@@ -10,7 +10,7 @@
     <test id="1 - serve General Patient Information">
         <name value="Test scenario 1.1 - Patient Information"/>
         <description value="Serve NL-PS General Patient Information resources"/>
-        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient" params="?_include=Patient:generalPractitioner"/>
+        <nts:include value="test.server.successfulSearch" scope="common" resource="Patient"/>
         <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1" nts:in-targets="#default"/>
         <nts:contentAsserts href="resources/patient-.xml" nts:in-targets="CheckContent"/>
     </test>

From 8ef21248a731290ed9432b25522f96aa2582f60c Mon Sep 17 00:00:00 2001
From: Ashwin-Nictiz <ashwin.djorai@nictiz.nl>
Date: Mon, 8 Sep 2025 15:10:07 +0200
Subject: [PATCH 20/20] Renamed maps

---
 .../nl-ps-gpi-test-1-1-client.xml                           | 1 -
 .../Test/{XIS-Server => Receiving-System}/properties.json   | 4 ++--
 .../nl-ps-gpi-test-1-1-server-json.xml                      | 0
 .../nl-ps-gpi-test-1-1-server-xml.xml                       | 0
 .../Test/{PHR-Client => Sending-System}/properties.json     | 4 ++--
 .../nl-ps-gpi-test-1-1-client.xml                           | 6 +++---
 .../nl-ps-gpi-test-1-1-server.xml                           | 0
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename output/R4/NL-PS-GPI-1-0/Test/{PHR-Client => Receiving-System}/nl-ps-gpi-test-1-1-client.xml (97%)
 rename output/R4/NL-PS-GPI-1-0/Test/{XIS-Server => Receiving-System}/properties.json (62%)
 rename output/R4/NL-PS-GPI-1-0/Test/{XIS-Server => Sending-System}/nl-ps-gpi-test-1-1-server-json.xml (100%)
 rename output/R4/NL-PS-GPI-1-0/Test/{XIS-Server => Sending-System}/nl-ps-gpi-test-1-1-server-xml.xml (100%)
 rename output/R4/NL-PS-GPI-1-0/Test/{PHR-Client => Sending-System}/properties.json (63%)
 rename src/NL-PS-GPI-1-0/Test/{PHR-Client => Receiving-System}/nl-ps-gpi-test-1-1-client.xml (88%)
 rename src/NL-PS-GPI-1-0/Test/{XIS-Server => Sending-System}/nl-ps-gpi-test-1-1-server.xml (100%)

diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/output/R4/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
similarity index 97%
rename from output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
rename to output/R4/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
index 23ffd8eaa9..31fd293091 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/output/R4/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
@@ -49,7 +49,6 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_include=Patient:general-practitioner"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="Bearer e88e4448-43ea-43fb-95ab-34d4def9ffe7"/>
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json b/output/R4/NL-PS-GPI-1-0/Test/Receiving-System/properties.json
similarity index 62%
rename from output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json
rename to output/R4/NL-PS-GPI-1-0/Test/Receiving-System/properties.json
index b0a388db8f..a1f1600b29 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/properties.json
+++ b/output/R4/NL-PS-GPI-1-0/Test/Receiving-System/properties.json
@@ -4,6 +4,6 @@
     "informationStandard" : "NL-PS-GPI-1-0",
     "usecase" : "NL-PS General Patient Information ",
     "role" : 
-    { "name" : "XIS-Server",
-      "description" : "XIS (DVA) in MedMij context" },
+    { "name" : "Receiving-System",
+      "description" : "System that receives information from a sending system" },
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml b/output/R4/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server-json.xml
similarity index 100%
rename from output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-json.xml
rename to output/R4/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server-json.xml
diff --git a/output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml b/output/R4/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server-xml.xml
similarity index 100%
rename from output/R4/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server-xml.xml
rename to output/R4/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server-xml.xml
diff --git a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json b/output/R4/NL-PS-GPI-1-0/Test/Sending-System/properties.json
similarity index 63%
rename from output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json
rename to output/R4/NL-PS-GPI-1-0/Test/Sending-System/properties.json
index 73c51d5337..3a9ffd78f2 100644
--- a/output/R4/NL-PS-GPI-1-0/Test/PHR-Client/properties.json
+++ b/output/R4/NL-PS-GPI-1-0/Test/Sending-System/properties.json
@@ -4,6 +4,6 @@
     "informationStandard" : "NL-PS-GPI-1-0",
     "usecase" : "NL-PS General Patient Information ",
     "role" : 
-    { "name" : "PHR-Client",
-      "description" : "Personal Health Record (PHR\/PGO) in MedMij context" },
+    { "name" : "Sending-System",
+      "description" : "System that sends information to a receiving system" },
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml b/src/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
similarity index 88%
rename from src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
rename to src/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
index c30050992f..e0053021cf 100644
--- a/src/NL-PS-GPI-1-0/Test/PHR-Client/nl-ps-gpi-test-1-1-client.xml
+++ b/src/NL-PS-GPI-1-0/Test/Receiving-System/nl-ps-gpi-test-1-1-client.xml
@@ -6,12 +6,12 @@
     <name value="NL-PS General Patient Information - Client - Test scenario 1.1"/>
     <description value="Scenario 1.1 - Retrieve NL-PS General Patient Information resources of Reebeen"/>
     <nts:authToken patientResourceId="patient-"/>
-   
+
     <test id="scenario-1-1-retrieve-patient">
         <name value="Scenario 1.1 - Patient"/>
         <description value="Query Patient resource"/>
-        <nts:include value="test.client.search" scope="common" resource="Patient" params="?_include=Patient:general-practitioner" useToken="true"/>
+        <nts:include value="test.client.search" scope="common" resource="Patient" useToken="true"/>
         <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>     
+        <nts:include value="assert.response.numResources" scope="common" resource="Patient" count="1"/>
     </test>
 </TestScript>
diff --git a/src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml b/src/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server.xml
similarity index 100%
rename from src/NL-PS-GPI-1-0/Test/XIS-Server/nl-ps-gpi-test-1-1-server.xml
rename to src/NL-PS-GPI-1-0/Test/Sending-System/nl-ps-gpi-test-1-1-server.xml