From b0aa61fb15ae858876c92e23161ca349455eebd7 Mon Sep 17 00:00:00 2001
From: Pieter Edelman <edelman@nictiz.nl>
Date: Fri, 1 Aug 2025 13:50:43 +0200
Subject: [PATCH] EOVDR-471: Repair TestScripts in Test folder

---
 .../Scenario1-1-phase1-negotiation1.xml               | 11 ++++-------
 .../Scenario1-1-phase1-negotiation2.xml               |  8 +++-----
 .../Scenario1-1-phase2-handoff.xml                    | 11 ++++-------
 .../Scenario1-10b-phase2-handoff.xml                  | 11 ++++-------
 .../Scenario1-11b-phase2-handoff.xml                  | 11 ++++-------
 .../Scenario1-1b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-1b-phase1-negotiation2.xml              |  8 +++-----
 .../Scenario1-1b-phase2-handoff.xml                   | 11 ++++-------
 .../Scenario1-2b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-2b-phase1-negotiation2.xml              |  8 +++-----
 .../Scenario1-2b-phase1-negotiation3.xml              |  8 +++-----
 .../Scenario1-2b-phase2-handoff.xml                   | 11 ++++-------
 .../Scenario1-3b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-3b-phase1-negotiation2.xml              |  8 +++-----
 .../Scenario1-3b-phase2-handoff.xml                   | 11 ++++-------
 .../Scenario1-4b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-4b-phase1-negotiation2.xml              |  8 +++-----
 .../Scenario1-4b-phase2-handoff.xml                   | 11 ++++-------
 .../Scenario1-5-phase1-negotiation1.xml               | 11 ++++-------
 .../Scenario1-5-phase1-negotiation2.xml               |  8 +++-----
 .../Scenario1-5-phase2-handoff.xml                    | 11 ++++-------
 .../Scenario1-6-phase1-negotiation1.xml               | 11 ++++-------
 .../Scenario1-6-phase1-negotiation2.xml               |  8 +++-----
 .../Scenario1-6-phase2-handoff.xml                    | 11 ++++-------
 .../Scenario1-7-phase1-negotiation1.xml               | 11 ++++-------
 .../Scenario1-7-phase1-negotiation2.xml               |  8 +++-----
 .../Scenario1-7-phase2-handoff.xml                    | 11 ++++-------
 .../Scenario1-8-phase1-negotiation1.xml               | 11 ++++-------
 .../Scenario1-8-phase1-negotiation2.xml               |  8 +++-----
 .../Scenario1-8-phase2-handoff.xml                    | 11 ++++-------
 .../Scenario1-9b-phase2-handoff.xml                   | 11 ++++-------
 .../Receiving-XIS/Scenario1-1-phase1-negotiation1.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-1-phase1-negotiation2.xml |  8 +++-----
 .../Test/Receiving-XIS/Scenario1-1-phase2-handoff.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-10b-phase2-handoff.xml    | 11 ++++-------
 .../Receiving-XIS/Scenario1-11b-phase2-handoff.xml    | 11 ++++-------
 .../Scenario1-1b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-1b-phase1-negotiation2.xml              |  8 +++-----
 .../Receiving-XIS/Scenario1-1b-phase2-handoff.xml     | 11 ++++-------
 .../Scenario1-2b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-2b-phase1-negotiation2.xml              |  8 +++-----
 .../Scenario1-2b-phase1-negotiation3.xml              |  8 +++-----
 .../Receiving-XIS/Scenario1-2b-phase2-handoff.xml     | 11 ++++-------
 .../Scenario1-3b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-3b-phase1-negotiation2.xml              |  8 +++-----
 .../Receiving-XIS/Scenario1-3b-phase2-handoff.xml     | 11 ++++-------
 .../Scenario1-4b-phase1-negotiation1.xml              | 11 ++++-------
 .../Scenario1-4b-phase1-negotiation2.xml              |  8 +++-----
 .../Receiving-XIS/Scenario1-4b-phase2-handoff.xml     | 11 ++++-------
 .../Receiving-XIS/Scenario1-5-phase1-negotiation1.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-5-phase1-negotiation2.xml |  8 +++-----
 .../Test/Receiving-XIS/Scenario1-5-phase2-handoff.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-6-phase1-negotiation1.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-6-phase1-negotiation2.xml |  8 +++-----
 .../Test/Receiving-XIS/Scenario1-6-phase2-handoff.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-7-phase1-negotiation1.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-7-phase1-negotiation2.xml |  8 +++-----
 .../Test/Receiving-XIS/Scenario1-7-phase2-handoff.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-8-phase1-negotiation1.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-8-phase1-negotiation2.xml |  8 +++-----
 .../Test/Receiving-XIS/Scenario1-8-phase2-handoff.xml | 11 ++++-------
 .../Receiving-XIS/Scenario1-9b-phase2-handoff.xml     | 11 ++++-------
 .../Scenario1-1-phase1-negotiation-json.xml           |  8 ++------
 .../Scenario1-1-phase1-negotiation-xml.xml            |  8 ++------
 .../Scenario1-1-phase2-handoff-json.xml               |  8 ++------
 .../Scenario1-1-phase2-handoff-xml.xml                |  8 ++------
 .../Scenario1-10b-phase2-handoff-json.xml             |  8 ++------
 .../Scenario1-10b-phase2-handoff-xml.xml              |  8 ++------
 .../Scenario1-11b-phase2-handoff-json.xml             |  8 ++------
 .../Scenario1-11b-phase2-handoff-xml.xml              |  8 ++------
 .../Scenario1-1b-phase1-negotiation-json.xml          |  8 ++------
 .../Scenario1-1b-phase1-negotiation-xml.xml           |  8 ++------
 .../Scenario1-1b-phase2-handoff-json.xml              |  8 ++------
 .../Scenario1-1b-phase2-handoff-xml.xml               |  8 ++------
 .../Scenario1-2b-phase1-negotiation-json.xml          |  8 ++------
 .../Scenario1-2b-phase1-negotiation-xml.xml           |  8 ++------
 .../Scenario1-2b-phase2-handoff-json.xml              |  8 ++------
 .../Scenario1-2b-phase2-handoff-xml.xml               |  8 ++------
 .../Scenario1-3b-phase1-negotiation-json.xml          |  8 ++------
 .../Scenario1-3b-phase1-negotiation-xml.xml           |  8 ++------
 .../Scenario1-3b-phase2-handoff-json.xml              |  8 ++------
 .../Scenario1-3b-phase2-handoff-xml.xml               |  8 ++------
 .../Scenario1-4b-phase1-negotiation-json.xml          |  8 ++------
 .../Scenario1-4b-phase1-negotiation-xml.xml           |  8 ++------
 .../Scenario1-4b-phase2-handoff-json.xml              |  8 ++------
 .../Scenario1-4b-phase2-handoff-xml.xml               |  8 ++------
 .../Scenario1-5-phase1-negotiation-json.xml           |  8 ++------
 .../Scenario1-5-phase1-negotiation-xml.xml            |  8 ++------
 .../Scenario1-5-phase2-handoff-json.xml               |  8 ++------
 .../Scenario1-5-phase2-handoff-xml.xml                |  8 ++------
 .../Scenario1-6-phase1-negotiation-json.xml           |  8 ++------
 .../Scenario1-6-phase1-negotiation-xml.xml            |  8 ++------
 .../Scenario1-6-phase2-handoff-json.xml               |  8 ++------
 .../Scenario1-6-phase2-handoff-xml.xml                |  8 ++------
 .../Scenario1-7-phase1-negotiation-json.xml           |  8 ++------
 .../Scenario1-7-phase1-negotiation-xml.xml            |  8 ++------
 .../Scenario1-7-phase2-handoff-json.xml               |  8 ++------
 .../Scenario1-7-phase2-handoff-xml.xml                |  8 ++------
 .../Scenario1-8-phase1-negotiation-json.xml           |  8 ++------
 .../Scenario1-8-phase1-negotiation-xml.xml            |  8 ++------
 .../Scenario1-8-phase2-handoff-json.xml               |  8 ++------
 .../Scenario1-8-phase2-handoff-xml.xml                |  8 ++------
 .../Scenario1-9b-phase2-handoff-json.xml              |  8 ++------
 .../Scenario1-9b-phase2-handoff-xml.xml               |  8 ++------
 .../Scenario1-1-phase1-negotiation-json.xml           |  5 +----
 .../Scenario1-1-phase1-negotiation-xml.xml            |  5 +----
 .../Sending-XIS/Scenario1-1-phase2-handoff-json.xml   |  5 +----
 .../Sending-XIS/Scenario1-1-phase2-handoff-xml.xml    |  5 +----
 .../Sending-XIS/Scenario1-10b-phase2-handoff-json.xml |  5 +----
 .../Sending-XIS/Scenario1-10b-phase2-handoff-xml.xml  |  5 +----
 .../Sending-XIS/Scenario1-11b-phase2-handoff-json.xml |  5 +----
 .../Sending-XIS/Scenario1-11b-phase2-handoff-xml.xml  |  5 +----
 .../Scenario1-1b-phase1-negotiation-json.xml          |  5 +----
 .../Scenario1-1b-phase1-negotiation-xml.xml           |  5 +----
 .../Sending-XIS/Scenario1-1b-phase2-handoff-json.xml  |  5 +----
 .../Sending-XIS/Scenario1-1b-phase2-handoff-xml.xml   |  5 +----
 .../Scenario1-2b-phase1-negotiation-json.xml          |  5 +----
 .../Scenario1-2b-phase1-negotiation-xml.xml           |  5 +----
 .../Sending-XIS/Scenario1-2b-phase2-handoff-json.xml  |  5 +----
 .../Sending-XIS/Scenario1-2b-phase2-handoff-xml.xml   |  5 +----
 .../Scenario1-3b-phase1-negotiation-json.xml          |  5 +----
 .../Scenario1-3b-phase1-negotiation-xml.xml           |  5 +----
 .../Sending-XIS/Scenario1-3b-phase2-handoff-json.xml  |  5 +----
 .../Sending-XIS/Scenario1-3b-phase2-handoff-xml.xml   |  5 +----
 .../Scenario1-4b-phase1-negotiation-json.xml          |  5 +----
 .../Scenario1-4b-phase1-negotiation-xml.xml           |  5 +----
 .../Sending-XIS/Scenario1-4b-phase2-handoff-json.xml  |  5 +----
 .../Sending-XIS/Scenario1-4b-phase2-handoff-xml.xml   |  5 +----
 .../Scenario1-5-phase1-negotiation-json.xml           |  5 +----
 .../Scenario1-5-phase1-negotiation-xml.xml            |  5 +----
 .../Sending-XIS/Scenario1-5-phase2-handoff-json.xml   |  5 +----
 .../Sending-XIS/Scenario1-5-phase2-handoff-xml.xml    |  5 +----
 .../Scenario1-6-phase1-negotiation-json.xml           |  5 +----
 .../Scenario1-6-phase1-negotiation-xml.xml            |  5 +----
 .../Sending-XIS/Scenario1-6-phase2-handoff-json.xml   |  5 +----
 .../Sending-XIS/Scenario1-6-phase2-handoff-xml.xml    |  5 +----
 .../Scenario1-7-phase1-negotiation-json.xml           |  5 +----
 .../Scenario1-7-phase1-negotiation-xml.xml            |  5 +----
 .../Sending-XIS/Scenario1-7-phase2-handoff-json.xml   |  5 +----
 .../Sending-XIS/Scenario1-7-phase2-handoff-xml.xml    |  5 +----
 .../Scenario1-8-phase1-negotiation-json.xml           |  5 +----
 .../Scenario1-8-phase1-negotiation-xml.xml            |  5 +----
 .../Sending-XIS/Scenario1-8-phase2-handoff-json.xml   |  5 +----
 .../Sending-XIS/Scenario1-8-phase2-handoff-xml.xml    |  5 +----
 .../Sending-XIS/Scenario1-9b-phase2-handoff-json.xml  |  5 +----
 .../Sending-XIS/Scenario1-9b-phase2-handoff-xml.xml   |  5 +----
 146 files changed, 354 insertions(+), 814 deletions(-)

diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation1.xml
index 68d21c4800..db0fb5a89d 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation2.xml
index 66a70dd8fe..a6364abc6e 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase2-handoff.xml
index 9afa7d1be8..e3f8215511 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-10b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-10b-phase2-handoff.xml
index cf521746fc..6485102f60 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-10b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-10b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.10b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.10b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.10b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-11b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-11b-phase2-handoff.xml
index 05e62b96fc..365386b2e3 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-11b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-11b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.11b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.11b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.11b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation1.xml
index 3f02a67515..c090d668f8 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation2.xml
index fe017caf47..59c82b24ba 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase2-handoff.xml
index fc924164bf..6ff0e51205 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-1b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation1.xml
index fab2b6543f..ebc0d5b0eb 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -52,8 +49,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -109,10 +105,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation2.xml
index 1fe95a460b..b4947dc948 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -213,10 +210,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation3.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation3.xml
index 6690f34f7b..4b16ee8994 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation3.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase1-negotiation3.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation3 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -199,10 +196,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase2-handoff.xml
index b8aa7ca89c..3facd29809 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-2b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation1.xml
index b2710e444f..ce9657d257 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -52,8 +49,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -109,10 +105,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation2.xml
index 41b3b6cbb5..4968992f50 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -208,10 +205,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase2-handoff.xml
index c5069d5e68..6bf264e44b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-3b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation1.xml
index 8348fe9fec..37eed80a66 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation2.xml
index 5836a35a74..a5cab57224 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase2-handoff.xml
index a1c585436d..535c75d548 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-4b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation1.xml
index 56a7271d2f..8a1cf0fcae 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation2.xml
index 19d5423b0e..1e9075bb75 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase2-handoff.xml
index a7de054124..1e921f9c46 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-5-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation1.xml
index 05155584c8..45342cb8a8 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation2.xml
index d701b86836..89faea984a 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.6-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.6-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.6-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase2-handoff.xml
index 67a5f7ce3f..e0d0ae920c 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-6-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.6-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.6-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.6-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation1.xml
index 48d8700e5d..2c7c3c6251 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation2.xml
index 789e79dfbb..1b8330011a 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase2-handoff.xml
index d8f0b56986..002c5ae991 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-7-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation1.xml
index 41a8036e09..27aa45cbea 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-negotiation1 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation2.xml
index ef17545a6d..b93770cfca 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-negotiation-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-negotiation-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-negotiation2 - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase2-handoff.xml
index 7715f22385..f5e100e301 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-8-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-9b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-9b-phase2-handoff.xml
index bf74e70cec..fab38602d4 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-9b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS-NoDocument/Scenario1-9b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.9b-handoff-NoDocument"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.9b-handoff-NoDocument"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.9b-handoff - target NoDocument"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation1.xml
index 8aad382f6f..996c65bcb0 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation2.xml
index 906c430609..55e2ad3d04 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase2-handoff.xml
index 843b044bee..94deb913a9 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-10b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-10b-phase2-handoff.xml
index e4d2719a38..2668713c55 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-10b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-10b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.10b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.10b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.10b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-11b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-11b-phase2-handoff.xml
index 83c8c288b9..a9f68eb9fb 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-11b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-11b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.11b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.11b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.11b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation1.xml
index 8a002007b5..21ef791fad 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation2.xml
index 0513d16512..feb200b244 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase2-handoff.xml
index 329b5e0075..d72aa40ed6 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-1b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.1b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.1b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.1b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation1.xml
index cc91e3ba4a..c37bc2a56d 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -52,8 +49,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -109,10 +105,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation2.xml
index 0aba54556d..cfff949d4f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -213,10 +210,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation3.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation3.xml
index 612c584acd..20a801337c 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation3.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase1-negotiation3.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-negotiation3"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -199,10 +196,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase2-handoff.xml
index 7ada8d0eab..7d58931a7e 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-2b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.2b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.2b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.2b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation1.xml
index c97ee5e158..c450f85c97 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -52,8 +49,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -109,10 +105,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation2.xml
index fdfce0cb59..6a5aa3d06d 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -208,10 +205,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase2-handoff.xml
index f68782521e..65d5b8080b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-3b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.3b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.3b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.3b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation1.xml
index 9deccdd48c..95a7ca2e1c 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation2.xml
index 2bf58afc06..fbac27735d 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase2-handoff.xml
index 9b8e29c767..53e847b7cb 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-4b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.4b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.4b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.4b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation1.xml
index 7e217d1273..e1b9f74d7c 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation2.xml
index d4fa94057d..821ca30ad8 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase2-handoff.xml
index 165d6e7ad7..5b5cc93815 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-5-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.5-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.5-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.5-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation1.xml
index 8a51fe547c..48e379fd53 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation2.xml
index cacf34aeb7..62ab6611ab 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.6-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.6-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.6-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase2-handoff.xml
index 6a45db16f3..d4a9b4fed1 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-6-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.6-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.6-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.6-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation1.xml
index 9b48f98655..9b6a67a8d2 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation2.xml
index ade32f6098..c62ee88ae5 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase2-handoff.xml
index 687a696e1d..80daf3379f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-7-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.7-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.7-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.7-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation1.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation1.xml
index f92dae9424..89b949fb40 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation1.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation1.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-negotiation1"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -47,8 +44,7 @@
    </fixture>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -104,10 +100,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation2.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation2.xml
index db7d5a4714..2795153c0d 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation2.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase1-negotiation2.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-negotiation"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-negotiation"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-negotiation2"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -194,10 +191,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase2-handoff.xml
index c69e064282..5ed59b8fa9 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-8-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.8-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.8-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.8-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-9b-phase2-handoff.xml b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-9b-phase2-handoff.xml
index 00e7bc3e27..c804575808 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-9b-phase2-handoff.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Receiving-XIS/Scenario1-9b-phase2-handoff.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Receiving-XIS-scenario1.9b-handoff"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <url value="http://nictiz.nl/fhir/TestScript/Receiving-XIS-scenario1.9b-handoff"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Receiving-XIS-scenario1.9b-handoff"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -56,8 +53,7 @@
             value="http://nictiz.nl/fhir/StructureDefinition/eOverdracht-Task"/>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="notificationEndpoint"/>
@@ -113,10 +109,11 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="create"/>
             </type>
-            <resource value="Resource"/>
             <label value="Notify receiving XIS"/>
             <description value="The sending XIS sends a notification to the specified endpoint of the receiving XIS."/>
+            <destination value="2"/>
             <encodeRequestUrl value="true"/>
+            <origin value="2"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${authorization-token-id}"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-json.xml
index c981bea5a8..11949b41e5 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-xml.xml
index 621351c78d..850e317bbc 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-json.xml
index 291628478d..3349cd5311 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-xml.xml
index bf4e9a2218..6fb23768d8 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-json.xml
index 6a7a896c73..f19520d1d9 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.10b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.10b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.10b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-xml.xml
index eee4cd86fa..393a73c60f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-10b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.10b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.10b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.10b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-json.xml
index 04142450e3..e96d5b7eb3 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.11b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.11b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.11b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-xml.xml
index f3a9755db1..ed2599cffe 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-11b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.11b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.11b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.11b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-json.xml
index 6ef7c03f2d..6b21d3f9d2 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-xml.xml
index 4b079c72b2..fa90cc3f3f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-json.xml
index 6ac8c65a8d..7f99d0b971 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-xml.xml
index 954785bcf7..1bfa0c07c2 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-1b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-json.xml
index 4351ff7534..f80004bafb 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -104,8 +101,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-xml.xml
index 1247cab001..adf8d9bdc0 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -104,8 +101,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-json.xml
index 520bd53ed0..1b36295dd5 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-xml.xml
index 665fc534f7..94e047eea2 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-2b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-json.xml
index 771ec01209..429641a8e7 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -97,8 +94,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-xml.xml
index a5d647998e..f52153e8ca 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -97,8 +94,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-json.xml
index 6ce3f07891..043510f2cd 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.3b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.3b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.3b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-xml.xml
index a681d83efb..5b2c4bae9a 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-3b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.3b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.3b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.3b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-json.xml
index 13706708ea..e580732b62 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-xml.xml
index 9c98639adc..132371ade1 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-json.xml
index e7ef7bc517..6774dd3c74 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-xml.xml
index 6190f23f77..4fce6e9066 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-4b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-json.xml
index 0396138544..c4bbea69c4 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-xml.xml
index 8fc9d74c53..882639184f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-json.xml
index 68f98e05fd..fcf8e2c423 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-xml.xml
index e3da7d3f5f..5d3c205f29 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-5-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-json.xml
index 92f16b2b09..f721972b0b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-xml.xml
index 4c1a7f625a..f9b010d413 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-json.xml
index f0e0883137..9a6974e02c 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-xml.xml
index 3f4744e310..c1f7d10915 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-6-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-json.xml
index dc7c683bc3..c891a5d0cc 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-xml.xml
index 6f0af4f036..937053821b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-json.xml
index 4ee31d48c3..38ab3dbc61 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-xml.xml
index 806d74e0e1..4e3f30d897 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-7-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-json.xml
index 80ac22dc99..f301070121 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-negotiation-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-xml.xml
index 323671ee4f..ab4ed81871 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-negotiation-Nictiz-only"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-negotiation-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-negotiation - target Nictiz-only"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="requested-task-response-composition-721915006-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-json.xml
index 68d4daec4c..f091734432 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-xml.xml
index 8deb24fa3f..6e9102b442 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-8-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-json.xml
index 2e6b48fd1e..0fe15e7d7f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.9b-handoff-Nictiz-only-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.9b-handoff-Nictiz-only-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.9b-handoff - target Nictiz-only - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-xml.xml
index cfc964f957..e4b8551252 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS-Nictiz-only/Scenario1-9b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.9b-handoff-Nictiz-only-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.9b-handoff-Nictiz-only-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.9b-handoff - target Nictiz-only - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
@@ -84,8 +81,7 @@
    </variable>
    <variable>
       <name value="task-id"/>
-      <expression value="Task.id"/>
-      <sourceId value="initial-task-fixture"/>
+      <defaultValue value="eOverdracht-Task-eov-cert-${CD6}-1-1b-01"/>
    </variable>
    <variable>
       <name value="in-progress-task-response-composition-11171000146100-id"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-json.xml
index bf9d5199db..6341c874d3 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-xml.xml
index 477513c319..ac97fe9a7f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-json.xml
index 5adb03c6d7..9320b6ba38 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-xml.xml
index 7966fc9317..5428f80776 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-json.xml
index 40fe8ffb6a..c58a369a51 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.10b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.10b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.10b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-xml.xml
index 6043e09e74..72343fc705 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-10b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.10b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.10b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.10b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-json.xml
index 34c4e0b73a..e73d240deb 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.11b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.11b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.11b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-xml.xml
index d89ae18503..99dc8fa094 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-11b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.11b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.11b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.11b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-json.xml
index 5eae39208f..d032ca9e21 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-xml.xml
index 6772d6f5ad..79943ebe28 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-json.xml
index fd1fc25902..aa3a879fc5 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-xml.xml
index 5021d5e783..4efabb057b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-1b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-json.xml
index f52192e80b..fb43349023 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-xml.xml
index aca1427cdd..1f196e5cab 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -21,7 +18,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-json.xml
index 989952639f..5d2d33ec34 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-xml.xml
index e4886c283e..be8a7053ce 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-2b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.2b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.2b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.2b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-json.xml
index 64464c950a..bde94f83d7 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-xml.xml
index 1fee5662d5..0cc5ed843b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.1b-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="rewrite-response-taskWithAlternativeDate"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.1b-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.1b-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-json.xml
index 6e688b3169..06507172fd 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.3b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.3b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.3b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-xml.xml
index ca85ce3b11..6d2874e05f 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-3b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.3b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.3b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.3b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-json.xml
index 4666d04897..600a208add 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-xml.xml
index 46b6a2d011..557445b228 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-json.xml
index c8b0db176d..af006d2eb6 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-xml.xml
index 4d5ebcad00..4bc3950f79 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-4b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.4b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.4b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.4b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-json.xml
index 174e11de6c..690508399e 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-xml.xml
index 44ea6c6598..f57f638757 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-json.xml
index b9a1f27e7c..de3d8b4030 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-xml.xml
index f03dfd9a0c..25a0861635 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-5-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.5-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.5-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.5-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-json.xml
index ba2aa1bd5b..2c2bcfc38b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-xml.xml
index 6c2c677551..450b16201e 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-json.xml
index 6ff703734d..dad1f575c5 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-xml.xml
index 152ba4de9e..3319c2c277 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-6-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.6-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.6-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.6-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-json.xml
index eb0e6f978f..f8e49c4107 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-xml.xml
index 80c2685519..3cca7eb42b 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-json.xml
index d2ffc9aca9..b284b58b07 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-xml.xml
index 9afe80d4b3..d1a882c4dc 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-7-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.7-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.7-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.7-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-json.xml
index 5219f84725..ec65392b1a 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-negotiation-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-negotiation-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-negotiation - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-xml.xml
index 6f712d0c4a..db7a02d140 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase1-negotiation-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-negotiation-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-negotiation-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-negotiation - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-json.xml
index cf1bb65f7a..665a43c8af 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-xml.xml
index bf44b307ab..e8e57be582 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-8-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.8-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.8-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.8-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-json.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-json.xml
index 8d0341be8a..50895c3ef1 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-json.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-json.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.9b-handoff-json"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.9b-handoff-json"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.9b-handoff - JSON Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
diff --git a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-xml.xml b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-xml.xml
index 900f278453..6a6699d2b2 100644
--- a/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-xml.xml
+++ b/output/STU3/eOverdracht4-0/MEO/Test/Sending-XIS/Scenario1-9b-phase2-handoff-xml.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
    <id value="Sending-XIS-scenario1.9b-handoff-xml"/>
-   <meta>
-      <profile value="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript"/>
-   </meta>
    <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-rule">
       <extension url="ruleId">
          <valueId value="modifyTask"/>
@@ -13,7 +10,7 @@
       </extension>
    </extension>
    <url value="http://nictiz.nl/fhir/TestScript/Sending-XIS-scenario1.9b-handoff-xml"/>
-   <version value="stu3-4.0-patchlevel 2025-02"/>
+   <version value="stu3-4.0-patchlevel 2025.31"/>
    <name value="Sending-XIS-scenario1.9b-handoff - XML Format"/>
    <status value="active"/>
    <publisher value="Nictiz"/>